diff --git a/ChangeLog b/ChangeLog index e8c99eea34..93118875cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ -Sat Jan 5 14:45:38 2008 Nobuyoshi Nakada +Sat Jan 5 16:50:48 2008 Nobuyoshi Nakada - * string.c (rb_str_resize): copy at old length but not new length. + * string.c (rb_str_resize): copy if old data is not empty [ruby-core:14785] Sat Jan 5 13:04:24 2008 Nobuyoshi Nakada diff --git a/string.c b/string.c index 979eb9bf84..ccebadb29d 100644 --- a/string.c +++ b/string.c @@ -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); - if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, slen); + if (slen > 0) MEMCPY(RSTRING(str)->as.ary, ptr, char, len); RSTRING(str)->as.ary[len] = '\0'; STR_SET_EMBED_LEN(str, len); xfree(ptr);