* string.c (rb_str_splice): integer overflow for length.

shyouhei · shyouhei · commit 6bcf74c4ef37 · 2007-09-07T05:37:05.000Z
[ruby-dev:31739]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@13371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep  7 14:32:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_splice): integer overflow for length.
+	  [ruby-dev:31739]
+
 Fri Sep  7 14:27:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (mnew): should preserve noex as safe_level.
diff --git a/string.c b/string.c
@@ -1644,7 +1644,7 @@ rb_str_splice(str, beg, len, val)
 	}
 	beg += RSTRING(str)->len;
     }
-    if (RSTRING(str)->len < beg + len) {
+    if (RSTRING(str)->len < len || RSTRING(str)->len < beg + len) {
 	len = RSTRING(str)->len - beg;
     }
 
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-09-07"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20070907
-#define RUBY_PATCHLEVEL 105
+#define RUBY_PATCHLEVEL 106
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -1644,7 +1644,7 @@ rb_str_splice(str, beg, len, val)`
`1644`	`1644`	`}`
`1645`	`1645`	`beg += RSTRING(str)->len;`
`1646`	`1646`	`}`
`1647`		`- if (RSTRING(str)->len < beg + len) {`
	`1647`	`+ if (RSTRING(str)->len < len \|\| RSTRING(str)->len < beg + len) {`
`1648`	`1648`	`len = RSTRING(str)->len - beg;`
`1649`	`1649`	`}`
`1650`	`1650`