From 980541b7fcce7d1a1664841139988b11d18e0a07 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 7 Oct 2008 07:50:43 +0000
Subject: * ext/json/lib/json/pure/generator.rb (utf8_to_json):  
 force_encoding before gsub.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                           | 5 +++++
 ext/json/lib/json/pure/generator.rb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03a834983..339244179 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  7 16:43:51 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/lib/json/pure/generator.rb (utf8_to_json):
+	  force_encoding before gsub.
+
 Tue Oct  7 16:35:41 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/json/lib/json/pure/generator.rb (utf8_to_json):
diff --git a/ext/json/lib/json/pure/generator.rb b/ext/json/lib/json/pure/generator.rb
index b44e42ac4..abc24bf72 100644
--- a/ext/json/lib/json/pure/generator.rb
+++ b/ext/json/lib/json/pure/generator.rb
@@ -40,8 +40,8 @@ module JSON
   # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
   # UTF16 big endian characters as \u????, and return it.
   def utf8_to_json(string) # :nodoc:
-    string = string.gsub(/["\\\/\x0-\x1f]/) { MAP[$&] }
-    string.force_encoding(Encoding::ASCII_8BIT)
+    string = string.dup.force_encoding(Encoding::ASCII_8BIT)
+    string.gsub!(/["\\\/\x0-\x1f]/) { MAP[$&] }
     string.gsub!(/(
                     (?:
                       [\xc2-\xdf][\x80-\xbf]    |
-- 
cgit