kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
the argument.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-07-08 07:40:41 +00:00
parent b16fd08622
commit 4902ef7d59
4 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/json/parser/parser.c
View file

@ -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;