yugui	2010-07-24 14:33:32 +0900 (Sat, 24 Jul 2010)

  New Revision: 28737

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28737

  Log:
    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.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/regexec.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28736)
+++ ruby_1_9_2/ChangeLog	(revision 28737)
@@ -1,3 +1,8 @@
+Wed Jul 14 18:18:05 2010  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* ext/dl/handle.c (rb_dlhandle_close): should not pass a dynamic
Index: ruby_1_9_2/regexec.c
===================================================================
--- ruby_1_9_2/regexec.c	(revision 28736)
+++ ruby_1_9_2/regexec.c	(revision 28737)
@@ -1300,13 +1300,13 @@
   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; }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/