naruse	2008-04-04 23:26:19 +0900 (Fri, 04 Apr 2008)

  New Revision: 15903

  Modified files:
    trunk/ChangeLog
    trunk/re.c

  Log:
    * re.c (rb_memsearch_qs): wrong boundary condition.
    
    * re.c (rb_memsearch_qs_utf8): ditto.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15903&r2=15902&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=15903&r2=15902&diff_format=u

Index: re.c
===================================================================
--- re.c	(revision 15902)
+++ re.c	(revision 15903)
@@ -135,7 +135,7 @@
 rb_memsearch_qs(const unsigned char *xs, long m, const unsigned char *ys, long n)
 {
     const unsigned char *x = xs, *xe = xs + m;
-    const unsigned char *y = ys, *ye = ys + n;
+    const unsigned char *y = ys;
     VALUE i, qstable[256];
 
     /* Preprocessing */
@@ -144,7 +144,7 @@
     for (; x < xe; ++x)
 	qstable[*x] = xe - x;
     /* Searching */
-    for (; y + m < ye; y += *(qstable + y[m])) {
+    for (; y + m <= ys + n; y += *(qstable + y[m])) {
 	if (*xs == *y && memcmp(xs, y, m) == 0)
 	    return y - ys;
     }
@@ -187,7 +187,7 @@
 rb_memsearch_qs_utf8(const unsigned char *xs, long m, const unsigned char *ys, long n)
 {
     const unsigned char *x = xs, *xe = xs + m;
-    const unsigned char *y = ys, *ye = ys + n;
+    const unsigned char *y = ys;
     VALUE i, qstable[512];
 
     /* Preprocessing */
@@ -198,7 +198,7 @@
 	qstable[rb_memsearch_qs_utf8_hash(x)] = xe - x;
     }
     /* Searching */
-    for (; y < ye; y += qstable[rb_memsearch_qs_utf8_hash(y+m)]) {
+    for (; y + m <= ys + n; y += qstable[rb_memsearch_qs_utf8_hash(y+m)]) {
 	if (*xs == *y && memcmp(xs, y, m) == 0)
 	    return y - ys;
     }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15902)
+++ ChangeLog	(revision 15903)
@@ -1,3 +1,9 @@
+Fri Apr  4 23:24:06 2008  NARUSE, Yui  <naruse@r...>
+
+	* re.c (rb_memsearch_qs): wrong boundary condition.
+
+	* re.c (rb_memsearch_qs_utf8): ditto.
+
 Fri Apr  4 14:11:36 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* re.c (rb_memsearch_qs): wrong boundary condition.  a patch from

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