diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-04 14:26:19 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-04 14:26:19 +0000 |
commit | 3467a1754c83c0f4061f345a7ee965f60d16fca5 (patch) | |
tree | e299979d20d7ee867b0ecf64ca9c41a265c1c327 /re.c | |
parent | 2b8af7d624d98743ccf605941f1c91c301a858fa (diff) |
* re.c (rb_memsearch_qs): wrong boundary condition.
* re.c (rb_memsearch_qs_utf8): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -135,7 +135,7 @@ static inline long 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 @@ rb_memsearch_qs(const unsigned char *xs, long m, const unsigned char *ys, long n 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 @@ static inline long 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 @@ rb_memsearch_qs_utf8(const unsigned char *xs, long m, const unsigned char *ys, l 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; } |