From 3ee33a6dbc636a16ff1aa89f070e428842ed1f32 Mon Sep 17 00:00:00 2001 From: matz Date: Sun, 9 Sep 2007 16:11:28 +0000 Subject: [PATCH] * range.c (range_step): fixed integer overflow. [ruby-dev:31763] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13422 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ range.c | 5 ++++- version.h | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8924732859..eafbde83e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Sep 10 01:05:25 2007 Yukihiro Matsumoto + + * range.c (range_step): fixed integer overflow. [ruby-dev:31763] + Sun Sep 9 08:57:27 2007 Tadayoshi Funaba * lib/date/format.rb (_strptime): now also attaches an element diff --git a/range.c b/range.c index 41c1cf088b..f5a8d15f5d 100644 --- a/range.c +++ b/range.c @@ -332,8 +332,11 @@ range_step(int argc, VALUE *argv, VALUE range) if (!EXCL(range)) end += 1; - for (i = FIX2LONG(b); i < end; i += unit) { + i = FIX2LONG(b); + while (i < end) { rb_yield(LONG2NUM(i)); + if (i + unit < i) break; + i += unit; } } else { diff --git a/version.h b/version.h index a5be8a3134..dec1cec9bf 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-09-08" +#define RUBY_RELEASE_DATE "2007-09-10" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070908 +#define RUBY_RELEASE_CODE 20070910 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 10 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];