From 4902ef7d591fb01f6c9f70ec194e147c47935541 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 8 Jul 2011 07:40:41 +0000 Subject: * ext/json/parser/parser.rl (convert_encoding): should not modify the argument. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/json/parser/parser.c | 11 ++++++----- ext/json/parser/parser.rl | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'ext/json') diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c index 817597ede4..04bedf33a7 100644 --- a/ext/json/parser/parser.c +++ b/ext/json/parser/parser.c @@ -1551,6 +1551,7 @@ static VALUE convert_encoding(VALUE source) } 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 @@ static VALUE cParser_parse(VALUE self) 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 @@ st10: 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 @@ case 9: _out: {} } -#line 698 "parser.rl" +#line 699 "parser.rl" if (cs >= JSON_first_final && p == pe) { return result; diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl index abd056f18c..07319a8fd7 100644 --- a/ext/json/parser/parser.rl +++ b/ext/json/parser/parser.rl @@ -549,6 +549,7 @@ static VALUE convert_encoding(VALUE source) } 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 { -- cgit v1.2.3