diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-24 05:33:32 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-24 05:33:32 +0000 |
commit | 25380b0a57d5c5442fedefe6be7f025ace5bd1b5 (patch) | |
tree | 7bcbf0962652a1a3155737f9b406953a6cdcab53 | |
parent | b0d5064d4a371d6e0bca557dec9da92fe2f36286 (diff) |
merges r28637 from trunk into ruby_1_9_2.
--
* regexec.c (match_at): add end point to enclen's argument.
This only effect on compilinig with -DONIG_DEBUG_MATCH.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regexec.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Jul 14 18:18:05 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * regexec.c (match_at): add end point to enclen's argument. + This only effect on compilinig with -DONIG_DEBUG_MATCH. + Tue Jul 13 20:46:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/dl/handle.c (rb_dlhandle_close): should not pass a dynamic @@ -1300,13 +1300,13 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, s = (UChar* )sstart; while (1) { #ifdef ONIG_DEBUG_MATCH - { + if (s) { UChar *q, *bp, buf[50]; int len; fprintf(stderr, "%4d> \"", (int )(s - str)); bp = buf; for (i = 0, q = s; i < 7 && q < end; i++) { - len = enclen(encode, q); + len = enclen(encode, q, end); while (len-- > 0) *bp++ = *q++; } if (q < end) { xmemcpy(bp, "...\"", 4); bp += 4; } |