Permalink
Browse files

Throw exception unless source is a string

  • Loading branch information...
1 parent 7c6e8cd commit 7f64f211d36e598a3c54a19d9caad9e3f9dca402 @flori committed Apr 27, 2012
Showing with 21 additions and 17 deletions.
  1. +18 −17 ext/json/ext/parser/parser.c
  2. +1 −0 ext/json/ext/parser/parser.rl
  3. +2 −0 tests/test_json.rb
@@ -1721,22 +1721,23 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
source = convert_encoding(StringValue(source));
}
json->current_nesting = 0;
+ StringValue(source);
json->len = RSTRING_LEN(source);
json->source = RSTRING_PTR(source);;
json->Vsource = source;
return self;
}
-#line 1732 "parser.c"
+#line 1733 "parser.c"
static const int JSON_start = 1;
static const int JSON_first_final = 10;
static const int JSON_error = 0;
static const int JSON_en_main = 1;
-#line 739 "parser.rl"
+#line 740 "parser.rl"
static VALUE cParser_parse_strict(VALUE self)
@@ -1747,16 +1748,16 @@ static VALUE cParser_parse_strict(VALUE self)
GET_PARSER;
-#line 1751 "parser.c"
+#line 1752 "parser.c"
{
cs = JSON_start;
}
-#line 749 "parser.rl"
+#line 750 "parser.rl"
p = json->source;
pe = p + json->len;
-#line 1760 "parser.c"
+#line 1761 "parser.c"
{
if ( p == pe )
goto _test_eof;
@@ -1812,7 +1813,7 @@ case 5:
goto st1;
goto st5;
tr3:
-#line 728 "parser.rl"
+#line 729 "parser.rl"
{
char *np;
json->current_nesting = 1;
@@ -1821,7 +1822,7 @@ case 5:
}
goto st10;
tr4:
-#line 721 "parser.rl"
+#line 722 "parser.rl"
{
char *np;
json->current_nesting = 1;
@@ -1833,7 +1834,7 @@ case 5:
if ( ++p == pe )
goto _test_eof10;
case 10:
-#line 1837 "parser.c"
+#line 1838 "parser.c"
switch( (*p) ) {
case 13: goto st10;
case 32: goto st10;
@@ -1890,7 +1891,7 @@ case 9:
_out: {}
}
-#line 752 "parser.rl"
+#line 753 "parser.rl"
if (cs >= JSON_first_final && p == pe) {
return result;
@@ -1902,15 +1903,15 @@ case 9:
-#line 1906 "parser.c"
+#line 1907 "parser.c"
static const int JSON_quirks_mode_start = 1;
static const int JSON_quirks_mode_first_final = 10;
static const int JSON_quirks_mode_error = 0;
static const int JSON_quirks_mode_en_main = 1;
-#line 777 "parser.rl"
+#line 778 "parser.rl"
static VALUE cParser_parse_quirks_mode(VALUE self)
@@ -1921,16 +1922,16 @@ static VALUE cParser_parse_quirks_mode(VALUE self)
GET_PARSER;
-#line 1925 "parser.c"
+#line 1926 "parser.c"
{
cs = JSON_quirks_mode_start;
}
-#line 787 "parser.rl"
+#line 788 "parser.rl"
p = json->source;
pe = p + json->len;
-#line 1934 "parser.c"
+#line 1935 "parser.c"
{
if ( p == pe )
goto _test_eof;
@@ -1964,7 +1965,7 @@ case 1:
cs = 0;
goto _out;
tr2:
-#line 769 "parser.rl"
+#line 770 "parser.rl"
{
char *np = JSON_parse_value(json, p, pe, &result);
if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
@@ -1974,7 +1975,7 @@ cs = 0;
if ( ++p == pe )
goto _test_eof10;
case 10:
-#line 1978 "parser.c"
+#line 1979 "parser.c"
switch( (*p) ) {
case 13: goto st10;
case 32: goto st10;
@@ -2063,7 +2064,7 @@ case 9:
_out: {}
}
-#line 790 "parser.rl"
+#line 791 "parser.rl"
if (cs >= JSON_quirks_mode_first_final && p == pe) {
return result;
@@ -705,6 +705,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
source = convert_encoding(StringValue(source));
}
json->current_nesting = 0;
+ StringValue(source);
json->len = RSTRING_LEN(source);
json->source = RSTRING_PTR(source);;
json->Vsource = source;
View
@@ -109,6 +109,8 @@ def test_parse_simple_objects
def test_parse_json_primitive_values
assert_raise(JSON::ParserError) { JSON.parse('') }
assert_raise(JSON::ParserError) { JSON.parse('', :quirks_mode => true) }
+ assert_raise(TypeError) { JSON::Parser.new(nil).parse }
+ assert_raise(TypeError) { JSON::Parser.new(nil, :quirks_mode => true).parse }
assert_raise(TypeError) { JSON.parse(nil) }
assert_raise(TypeError) { JSON.parse(nil, :quirks_mode => true) }
assert_raise(JSON::ParserError) { JSON.parse(' /* foo */ ') }

0 comments on commit 7f64f21

Please sign in to comment.