diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/json/parser/parser.c | 17 | ||||
| -rw-r--r-- | ext/json/parser/parser.h | 3 | ||||
| -rw-r--r-- | ext/json/parser/parser.rl | 7 | ||||
| -rwxr-xr-x | test/json/test_json.rb | 7 |
5 files changed, 34 insertions, 7 deletions
@@ -1,3 +1,10 @@ +Sat Feb 5 10:29:52 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/json/parser/parser.h (GET_PARSER): check if initialized. + [ruby-core:35079] + + * ext/json/parser/parser.rl (cParser_initialize): ditto. + Sat Feb 5 10:09:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * load.c (rb_get_expanded_load_path): always expand load paths. diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c index b4faa864d8..22c8167fc7 100644 --- a/ext/json/parser/parser.c +++ b/ext/json/parser/parser.c @@ -1610,7 +1610,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) char *ptr; long len; VALUE source, opts; - GET_PARSER; + GET_PARSER_INIT; + + if (json->Vsource) { + rb_raise(rb_eArgError, "already initialized instance"); + } rb_scan_args(argc, argv, "11", &source, &opts); source = convert_encoding(StringValue(source)); ptr = RSTRING_PTR(source); @@ -1698,16 +1702,16 @@ static VALUE cParser_parse(VALUE self) GET_PARSER; -#line 1702 "parser.c" +#line 1706 "parser.c" { cs = JSON_start; } -#line 699 "parser.rl" +#line 703 "parser.rl" p = json->source; pe = p + json->len; -#line 1711 "parser.c" +#line 1715 "parser.c" { if ( p == pe ) goto _test_eof; @@ -1784,7 +1788,7 @@ st10: if ( ++p == pe ) goto _test_eof10; case 10: -#line 1788 "parser.c" +#line 1792 "parser.c" switch( (*p) ) { case 13: goto st10; case 32: goto st10; @@ -1841,7 +1845,7 @@ case 9: _out: {} } -#line 702 "parser.rl" +#line 706 "parser.rl" if (cs >= JSON_first_final && p == pe) { return result; @@ -1938,5 +1942,6 @@ void Init_parser() * Local variables: * mode: c * c-file-style: ruby + * indent-tabs-mode: nil * End: */ diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h index 688ffdaeba..5d4532b948 100644 --- a/ext/json/parser/parser.h +++ b/ext/json/parser/parser.h @@ -44,6 +44,9 @@ typedef struct JSON_ParserStruct { } JSON_Parser; #define GET_PARSER \ + GET_PARSER_INIT; \ + if (!json->Vsource) rb_raise(rb_eArgError, "uninitialized instance") +#define GET_PARSER_INIT \ JSON_Parser *json; \ Data_Get_Struct(self, JSON_Parser, json) diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl index 3ec7d1ce14..680242732e 100644 --- a/ext/json/parser/parser.rl +++ b/ext/json/parser/parser.rl @@ -608,7 +608,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self) char *ptr; long len; VALUE source, opts; - GET_PARSER; + GET_PARSER_INIT; + + if (json->Vsource) { + rb_raise(rb_eArgError, "already initialized instance"); + } rb_scan_args(argc, argv, "11", &source, &opts); source = convert_encoding(StringValue(source)); ptr = RSTRING_PTR(source); @@ -795,5 +799,6 @@ void Init_parser() * Local variables: * mode: c * c-file-style: ruby + * indent-tabs-mode: nil * End: */ diff --git a/test/json/test_json.rb b/test/json/test_json.rb index 00e52f511a..cb70085242 100755 --- a/test/json/test_json.rb +++ b/test/json/test_json.rb @@ -391,4 +391,11 @@ EOT json5 = JSON([orig = 1 << 64]) assert_equal orig, JSON[json5][0] end + + def test_allocate + json = JSON::Parser.new("{}") + assert_raises(ArgumentError, '[ruby-core:35079]') {json.__send__(:initialize, "{}")} + json = JSON::Parser.allocate + assert_raises(ArgumentError, '[ruby-core:35079]') {json.source} + end end |