matz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 9 insertions, 1 deletions

diff --git a/string.c b/string.c
index 6343a2af5f..5eb5d248ed 100644
--- a/string.c
+++ b/string.c
@@ -427,10 +427,18 @@ rb_str_cat(str, ptr, len)
     long len;
 {
     if (len > 0) {
+	int poffset = -1;
+
 	rb_str_modify(str);
+	if (RSTRING(str)->ptr <= ptr &&
+	    ptr < RSTRING(str)->ptr + RSTRING(str)->len) {
+	    poffset = ptr - RSTRING(str)->ptr;
+	}
 	REALLOC_N(RSTRING(str)->ptr, char, RSTRING(str)->len + len + 1);
-	if (ptr)
+	if (ptr) {
+	    if (poffset >= 0) ptr = RSTRING(str)->ptr + poffset;
 	    memcpy(RSTRING(str)->ptr + RSTRING(str)->len, ptr, len);
+	}
 	RSTRING(str)->len += len;
 	RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; /* sentinel */
     }