1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* regexec.c (match_at): follow enclen's change.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-12-24 06:21:14 +00:00
parent ab2a02348b
commit c80535e50d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Dec 24 15:20:03 2009 NARUSE, Yui <naruse@ruby-lang.org>
* regexec.c (match_at): follow enclen's change.
Thu Dec 24 12:08:00 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca> Thu Dec 24 12:08:00 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/delegate.rb (marshal_dump/load): dump & load instance variables * lib/delegate.rb (marshal_dump/load): dump & load instance variables

4
regexec.c
View File

@ -1878,7 +1878,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (scv) goto fail; if (scv) goto fail;
STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem); STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem);
n = enclen(encode, s); n = enclen(encode, s, end);
DATA_ENSURE(n); DATA_ENSURE(n);
if (ONIGENC_IS_MBC_NEWLINE(encode, s, end)) goto fail; if (ONIGENC_IS_MBC_NEWLINE(encode, s, end)) goto fail;
sprev = s; sprev = s;
@ -1896,7 +1896,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (scv) goto fail; if (scv) goto fail;
STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem); STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem);
n = enclen(encode, s); n = enclen(encode, s, end);
if (n > 1) { if (n > 1) {
DATA_ENSURE(n); DATA_ENSURE(n);
sprev = s; sprev = s;