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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Fri Jul 8 16:39:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jul 8 16:40:38 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/json/parser/parser.rl (convert_encoding): should not modify
the argument.
* ext/json/parser/parser.rl (convert_encoding): no needs to use * ext/json/parser/parser.rl (convert_encoding): no needs to use
force_encoding. force_encoding.

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) { } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE); source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE);
} else { } else {
source = rb_str_dup(source);
FORCE_UTF8(source); FORCE_UTF8(source);
} }
} else { } else {
@ -1694,16 +1695,16 @@ static VALUE cParser_parse(VALUE self)
GET_PARSER; GET_PARSER;
#line 1698 "parser.c" #line 1699 "parser.c"
{ {
cs = JSON_start; cs = JSON_start;
} }
#line 695 "parser.rl" #line 696 "parser.rl"
p = json->source; p = json->source;
pe = p + json->len; pe = p + json->len;
#line 1707 "parser.c" #line 1708 "parser.c"
{ {
if ( p == pe ) if ( p == pe )
goto _test_eof; goto _test_eof;
@ -1780,7 +1781,7 @@ st10:
if ( ++p == pe ) if ( ++p == pe )
goto _test_eof10; goto _test_eof10;
case 10: case 10:
#line 1784 "parser.c" #line 1785 "parser.c"
switch( (*p) ) { switch( (*p) ) {
case 13: goto st10; case 13: goto st10;
case 32: goto st10; case 32: goto st10;
@ -1837,7 +1838,7 @@ case 9:
_out: {} _out: {}
} }
#line 698 "parser.rl" #line 699 "parser.rl"
if (cs >= JSON_first_final && p == pe) { if (cs >= JSON_first_final && p == pe) {
return result; return result;

1
ext/json/parser/parser.rl
View file

@ -549,6 +549,7 @@ static VALUE convert_encoding(VALUE source)
} else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) { } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE); source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE);
} else { } else {
source = rb_str_dup(source);
FORCE_UTF8(source); FORCE_UTF8(source);
} }
} else { } else {

13
test/json/test_json.rb
View file

@ -398,4 +398,17 @@ EOT
json = JSON::Parser.allocate json = JSON::Parser.allocate
assert_raises(TypeError, '[ruby-core:35079]') {json.source} assert_raises(TypeError, '[ruby-core:35079]') {json.source}
end 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 end