nobu	2011-07-08 16:40:41 +0900 (Fri, 08 Jul 2011)

  New Revision: 32458

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32458

  Log:
    * ext/json/parser/parser.rl (convert_encoding): should not modify
      the argument.

  Modified files:
    trunk/ChangeLog
    trunk/ext/json/parser/parser.c
    trunk/ext/json/parser/parser.rl
    trunk/test/json/test_json.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32457)
+++ ChangeLog	(revision 32458)
@@ -1,5 +1,8 @@
-Fri Jul  8 16:39:03 2011  Nobuyoshi Nakada  <nobu@r...>
+Fri Jul  8 16:40:38 2011  Nobuyoshi Nakada  <nobu@r...>
 
+	* ext/json/parser/parser.rl (convert_encoding): should not modify
+	  the argument.
+
 	* ext/json/parser/parser.rl (convert_encoding): no needs to use
 	  force_encoding.
 
Index: ext/json/parser/parser.rl
===================================================================
--- ext/json/parser/parser.rl	(revision 32457)
+++ ext/json/parser/parser.rl	(revision 32458)
@@ -549,6 +549,7 @@
             } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
                 source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE);
             } else {
+                source = rb_str_dup(source);
                 FORCE_UTF8(source);
             }
         } else {
Index: ext/json/parser/parser.c
===================================================================
--- ext/json/parser/parser.c	(revision 32457)
+++ ext/json/parser/parser.c	(revision 32458)
@@ -1551,6 +1551,7 @@
             } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
                 source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE);
             } else {
+                source = rb_str_dup(source);
                 FORCE_UTF8(source);
             }
         } else {
@@ -1694,16 +1695,16 @@
     GET_PARSER;
 
 
-#line 1698 "parser.c"
+#line 1699 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 695 "parser.rl"
+#line 696 "parser.rl"
     p = json->source;
     pe = p + json->len;
 
-#line 1707 "parser.c"
+#line 1708 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1780,7 +1781,7 @@
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 1784 "parser.c"
+#line 1785 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -1837,7 +1838,7 @@
 	_out: {}
 	}
 
-#line 698 "parser.rl"
+#line 699 "parser.rl"
 
     if (cs >= JSON_first_final && p == pe) {
         return result;
Index: test/json/test_json.rb
===================================================================
--- test/json/test_json.rb	(revision 32457)
+++ test/json/test_json.rb	(revision 32458)
@@ -398,4 +398,17 @@
     json = JSON::Parser.allocate
     assert_raises(TypeError, '[ruby-core:35079]') {json.source}
   end
+
+  def test_argument_encoding
+    source = "{}".force_encoding("ascii-8bit")
+    JSON::Parser.new(source)
+    assert_equal Encoding::ASCII_8BIT, source.encoding
+  end
+
+  def test_frozen_argument
+    source = "{}".force_encoding("ascii-8bit")
+    source.freeze
+    parser = nil
+    assert_nothing_raised {parser = JSON::Parser.new(source)}
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/