2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6867eab7c..e8c99eea3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/string.c b/string.c
index dfd2de0b4..979eb9bf8 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);
-	    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);