diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-05 13:06:01 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-05 13:06:01 +0000 |
commit | c349959778f17cb322b065a02da4183825f8e69e (patch) | |
tree | 283439c5704f17c3c6655625e6f9a0bc37d1a016 | |
parent | 9ecd43fa98bb45b77a1c2334c6e9ba500d31962a (diff) | |
download | ruby-c349959778f17cb322b065a02da4183825f8e69e.tar.gz |
* string.c (rb_str_splice): integer overflow for length.
[ruby-dev:31739]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 2 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Wed Sep 5 22:02:27 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * string.c (rb_str_splice): integer overflow for length. + [ruby-dev:31739] + Tue Sep 4 20:43:44 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp> * ext/win32ole/win32ole.c: add WIN32OLE_EVENT#unadvise. @@ -1893,7 +1893,7 @@ rb_str_splice(VALUE str, long beg, long len, VALUE val) } beg += slen; } - if (slen < beg + len) { + if (slen < len || slen < beg + len) { len = slen - beg; } p = str_nth(RSTRING_PTR(str), RSTRING_END(str), beg, enc); @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-09-04" +#define RUBY_RELEASE_DATE "2007-09-05" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070904 +#define RUBY_RELEASE_CODE 20070905 #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 4 +#define RUBY_RELEASE_DAY 5 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |