summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-04 05:13:06 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-04 05:13:06 +0000
commit2b8af7d624d98743ccf605941f1c91c301a858fa (patch)
tree8c206507b7bd2782aeb89b0ca7d7635499331076
parent3d09c87ab5db304ad797795d6f0d19e1d12e3765 (diff)
* re.c (rb_memsearch_qs): wrong boundary condition. a patch from
wanabe <s.wanabe AT gmail.com> in [ruby-dev:34248]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--re.c2
-rw-r--r--version.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b7fb7d6ad..0dfcd12e24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 4 14:11:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * re.c (rb_memsearch_qs): wrong boundary condition. a patch from
+ wanabe <s.wanabe AT gmail.com> in [ruby-dev:34248].
+
Fri Apr 4 05:57:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
diff --git a/re.c b/re.c
index 7ab7ad211b..98cead68f2 100644
--- a/re.c
+++ b/re.c
@@ -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 < ye; y += *(qstable + y[m])) {
+ for (; y + m < ye; y += *(qstable + y[m])) {
if (*xs == *y && memcmp(xs, y, m) == 0)
return y - ys;
}
diff --git a/version.h b/version.h
index 5c7af532ca..ce545fd06f 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-04-03"
+#define RUBY_RELEASE_DATE "2008-04-04"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080403
+#define RUBY_RELEASE_CODE 20080404
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];