From 7909d9d0c7bbc38f3893df1b6f66863bb1082ac8 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 22 Jul 2010 13:37:07 +0000 Subject: merge revision(s) 28648: * regexec.c (onig_search): don't skip non-ANYCHARs when .* fails to match. This causes to fail matching ANYCHAR_STAR with LOOK_BEHIND. This fix is workaround and disable the optimization. [ruby-dev:41851] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- regexec.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'regexec.c') diff --git a/regexec.c b/regexec.c index c011480ec8..13b6fadee2 100644 --- a/regexec.c +++ b/regexec.c @@ -3636,11 +3636,6 @@ onig_search(regex_t* reg, const UChar* str, const UChar* end, MATCH_AND_RETURN_CHECK(orig_range); prev = s; s += enclen(reg->enc, s, end); - - while (!ONIGENC_IS_MBC_NEWLINE(reg->enc, prev, end) && s < range) { - prev = s; - s += enclen(reg->enc, s, end); - } } while (s < range); goto mismatch; } -- cgit v1.2.3