diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | regexec.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -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> * lib/delegate.rb (marshal_dump/load): dump & load instance variables @@ -1878,7 +1878,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, if (scv) goto fail; STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem); - n = enclen(encode, s); + n = enclen(encode, s, end); DATA_ENSURE(n); if (ONIGENC_IS_MBC_NEWLINE(encode, s, end)) goto fail; sprev = s; @@ -1896,7 +1896,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, if (scv) goto fail; STACK_PUSH_ALT_WITH_STATE_CHECK(p, s, sprev, mem); - n = enclen(encode, s); + n = enclen(encode, s, end); if (n > 1) { DATA_ENSURE(n); sprev = s; |