diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-28 02:25:49 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-28 02:25:49 +0000 |
commit | 32fdf95a3215e5828772f77f9d61b76e5eb8896b (patch) | |
tree | 6b24d2c04b1d32a97b0f99f9a853e2164d9a4019 | |
parent | ce02662c0b256949db67f684bdfcf0ffa602ba66 (diff) |
merges r30652 from trunk into ruby_1_9_2.
--
* string.c (rb_str_resize): get rid of out-of-bound access.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | string.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Tue Jan 25 08:28:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_resize): get rid of out-of-bound access. + Tue Jan 25 07:00:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_string_value_cstr): rb_str_modify can change @@ -1712,7 +1712,8 @@ rb_str_resize(VALUE str, long len) else if (len <= RSTRING_EMBED_LEN_MAX) { char *ptr = RSTRING(str)->as.heap.ptr; STR_SET_EMBED(str); - if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, len); + if (slen > len) slen = len; + if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, slen); RSTRING(str)->as.ary[len] = '\0'; STR_SET_EMBED_LEN(str, len); xfree(ptr); @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 172 +#define RUBY_PATCHLEVEL 173 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |