diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Jan 5 14:45:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_str_resize): copy at old length but not new length. + [ruby-core:14785] + Sat Jan 5 13:04:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ruby.c (proc_options): no need for intermediate object. @@ -948,7 +948,7 @@ 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); - MEMCPY(RSTRING(str)->as.ary, ptr, char, 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); |