From 6ad91c11efc5f43442e9ca4d13b4de22c0746166 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 5 Jan 2008 07:50:50 +0000 Subject: * string.c (rb_str_resize): copy if old data is not empty [ruby-core:14785] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++-- string.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8c99eea3..93118875c 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 979eb9bf8..ccebadb29 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); -- cgit