From 10a129cee72512315e84d5b29a8ca471058e80ff Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Dec 2015 05:31:31 +0000
Subject: escape.c: should not freeze

* ext/cgi/escape/escape.c (optimized_escape_html): CGI.escapeHTML
  should return unfrozen new string.
  [ruby-core:72426] [Bug #11858]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/cgi/escape/escape.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ext/cgi/escape/escape.c')

diff --git a/ext/cgi/escape/escape.c b/ext/cgi/escape/escape.c
index 939b054ad2..e8f64f6dcc 100644
--- a/ext/cgi/escape/escape.c
+++ b/ext/cgi/escape/escape.c
@@ -30,7 +30,7 @@ preserve_original_state(VALUE orig, VALUE dest)
 {
     rb_enc_associate(dest, rb_enc_get(orig));
 
-    FL_SET_RAW(dest, FL_TEST_RAW(orig, FL_FREEZE|FL_TAINT));
+    RB_OBJ_INFECT_RAW(dest, orig);
 }
 
 static VALUE
@@ -69,7 +69,7 @@ optimized_escape_html(VALUE str)
 	return dest;
     }
     else {
-	return str;
+	return rb_str_dup(str);
     }
 }
 
-- 
cgit v1.2.3