From c4a8d40ca1d182125d2c17d76eac2e02af9072a5 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 20 May 2013 18:07:31 +0000
Subject: [PATCH] string.c: infect

* string.c (rb_str_conv_enc_opts): should infect.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 string.c  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6c08eb89c3..f812a3da0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 21 03:07:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_conv_enc_opts): should infect.
+
 Mon May 20 22:24:45 2013  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/set.rb (Set#delete_if, Set#keep_if): Avoid blockless call of
diff --git a/string.c b/string.c
index c45179f58d..aef65e74c7 100644
--- a/string.c
+++ b/string.c
@@ -520,6 +520,7 @@ rb_str_conv_enc_opts(VALUE str, rb_encoding *from, rb_encoding *to, int ecflags,
 
     len = RSTRING_LEN(str);
     newstr = rb_str_new(0, len);
+    OBJ_INFECT(newstr, str);
     olen = len;
 
     econv_wrapper = rb_obj_alloc(rb_cEncodingConverter);