From 47dfdac0f2e1a39f71f81fb033bd6dccec070925 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 30 Jun 2008 11:35:08 +0000 Subject: merge revision(s) 17530: * string.c (str_buf_cat): check for self concatenation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'string.c') diff --git a/string.c b/string.c index 0fb0f3b4cf..cb619f86b3 100644 --- a/string.c +++ b/string.c @@ -693,9 +693,13 @@ str_buf_cat(str, ptr, len) const char *ptr; long len; { - long capa, total; + long capa, total, off = -1;; rb_str_modify(str); + if (ptr >= RSTRING(str)->ptr && ptr <= RSTRING(str)->ptr + RSTRING(str)->len) { + off = ptr - RSTRING(str)->ptr; + } + if (len == 0) return 0; if (FL_TEST(str, STR_ASSOC)) { FL_UNSET(str, STR_ASSOC); capa = RSTRING(str)->aux.capa = RSTRING(str)->len; @@ -717,6 +721,9 @@ str_buf_cat(str, ptr, len) } RESIZE_CAPA(str, capa); } + if (off != -1) { + ptr = RSTRING(str)->ptr + off; + } memcpy(RSTRING(str)->ptr + RSTRING(str)->len, ptr, len); RSTRING(str)->len = total; RSTRING(str)->ptr[total] = '\0'; /* sentinel */ -- cgit v1.2.3