diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-07 07:40:27 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-07 07:40:27 +0000 |
commit | 80c37b72cf6f57718227076366a651bbc1f73960 (patch) | |
tree | 45715edfe9857b089360108d586c83c292856a29 | |
parent | 05f10eba96d36c10c38e9cee0697a0c105044010 (diff) |
* string.c (rb_str_splice): integer overflow for length.
[ruby-dev:31739]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Sep 7 16:39:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * string.c (rb_str_splice): integer overflow for length. + [ruby-dev:31739] + Fri Sep 7 16:33:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * include/ruby/defines.h (flush_register_windows): call "ta 0x03" @@ -1647,7 +1647,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; } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-09-07" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070907 -#define RUBY_PATCHLEVEL 97 +#define RUBY_PATCHLEVEL 98 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |