matz	2007-09-10 01:10:50 +0900 (Mon, 10 Sep 2007)

  New Revision: 13421

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/range.c
    branches/ruby_1_8/version.h

  Log:
    * range.c (range_step): fixed integer overflow.  [ruby-dev:31763]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/range.c?r1=13421&r2=13420
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13421&r2=13420
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=13421&r2=13420

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13420)
+++ ruby_1_8/ChangeLog	(revision 13421)
@@ -1,3 +1,4 @@
+<<<<<<< current
 Sun Sep  9 09:14:45 2007  Tadayoshi Funaba  <tadf@d...>
 
 	* lib/date/format.rb (_strptime): now also attaches an element
@@ -3,4 +4,10 @@
 	  which denotes leftover substring if exists.
 
+=======
+Mon Sep 10 01:05:25 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
+
+>>>>>>> patched
 Sat Sep  8 10:22:20 2007  Yukihiro Matsumoto  <matz@r...>
 
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 13420)
+++ ruby_1_8/version.h	(revision 13421)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-09-08"
+#define RUBY_RELEASE_DATE "2007-09-10"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070908
+#define RUBY_RELEASE_CODE 20070910
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #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[];
Index: ruby_1_8/range.c
===================================================================
--- ruby_1_8/range.c	(revision 13420)
+++ ruby_1_8/range.c	(revision 13421)
@@ -319,8 +319,11 @@
 
 	if (unit == 0) rb_raise(rb_eArgError, "step can't be 0");
 	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 {

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