merge revision(s) 17483:ruby_1_8_5

	* string.c (rb_str_buf_append): should infect.


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

1 files changed, 3 insertions, 1 deletions

diff --git a/string.c b/string.c
index 4f27d431ff..f0cea48267 100644
--- a/string.c
+++ b/string.c
@@ -775,7 +775,9 @@ VALUE
 rb_str_buf_append(str, str2)
     VALUE str, str2;
 {
-    return str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
+    str_buf_cat(str, RSTRING(str2)->ptr, RSTRING(str2)->len);
+    OBJ_INFECT(str, str2);
+    return str;
 }
 
 VALUE