kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* re.c (rb_memsearch_qs): wrong boundary condition.

Browse source 
* re.c (rb_memsearch_qs_utf8): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2008-04-04 14:26:19 +00:00
parent 2b8af7d624
commit 3467a1754c
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Apr 4 23:24:06 2008 NARUSE, Yui <naruse@ruby-lang.org>
* 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@ruby-lang.org> Fri Apr 4 14:11:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (rb_memsearch_qs): wrong boundary condition. a patch from * re.c (rb_memsearch_qs): wrong boundary condition. a patch from

8
re.c
View file

@ -135,7 +135,7 @@ static inline long
rb_memsearch_qs(const unsigned char *xs, long m, const unsigned char *ys, long n) 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 *x = xs, *xe = xs + m;
const unsigned char *y = ys, *ye = ys + n; const unsigned char *y = ys;
VALUE i, qstable[256]; VALUE i, qstable[256];
/* Preprocessing */ /* Preprocessing */
@ -144,7 +144,7 @@ rb_memsearch_qs(const unsigned char *xs, long m, const unsigned char *ys, long n
for (; x < xe; ++x) for (; x < xe; ++x)
qstable[*x] = xe - x; qstable[*x] = xe - x;
/* Searching */ /* 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) if (*xs == *y && memcmp(xs, y, m) == 0)
return y - ys; 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) 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 *x = xs, *xe = xs + m;
const unsigned char *y = ys, *ye = ys + n; const unsigned char *y = ys;
VALUE i, qstable[512]; VALUE i, qstable[512];
/* Preprocessing */ /* 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; qstable[rb_memsearch_qs_utf8_hash(x)] = xe - x;
} }
/* Searching */ /* 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) if (*xs == *y && memcmp(xs, y, m) == 0)
return y - ys; return y - ys;
} }