diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:53:47 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:53:47 +0000 |
commit | dd64b609a43469b04fc863ee7993ac7744991b2c (patch) | |
tree | 31316785a6d711a739cab76c06b0e127686ed757 | |
parent | 4c409527823a6dfa8ae1c8d312e6b89f6e486888 (diff) |
merge revision(s) 16400:
* string.c (rb_str_cat): fixed buffer overrun reported by
Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17298 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 @@ +Sun Jun 15 22:53:20 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * string.c (rb_str_cat): fixed buffer overrun reported by + Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746] + Sun Jun 15 22:51:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}. "defined?(a||=1)" @@ -747,7 +747,7 @@ rb_str_cat(str, ptr, len) } if (FL_TEST(str, STR_ASSOC)) { rb_str_modify(str); - REALLOC_N(RSTRING(str)->ptr, char, RSTRING(str)->len+len); + REALLOC_N(RSTRING(str)->ptr, char, RSTRING(str)->len+len+1); memcpy(RSTRING(str)->ptr + RSTRING(str)->len, ptr, len); RSTRING(str)->len += len; RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; /* sentinel */ @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 208 +#define RUBY_PATCHLEVEL 209 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |