merges r30791 and r30792 from trunk into ruby_1_9_2.

--
* ext/json/parser/parser.h (GET_PARSER): check if initialized.
  [ruby-core:35079]
* ext/json/parser/parser.rl (cParser_initialize): ditto.
--
* ext/json/parser/parser.h (GET_PARSER): raise TypeError.
* ext/json/parser/parser.rl (cParser_initialize): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

6 files changed, 39 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index fe6768f313..e8cae27ea3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Sat Feb  5 11:29:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/parser/parser.h (GET_PARSER): raise TypeError.
+
+	* ext/json/parser/parser.rl (cParser_initialize): ditto.
+
+	* ext/json/parser/parser.h (GET_PARSER): check if initialized.
+	  [ruby-core:35079]
+
+	* ext/json/parser/parser.rl (cParser_initialize): ditto.
+
 Sun May  1 18:35:34 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* test/fileutils/fileasserts.rb (assert_block): little workaround
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index cf4bbfa531..42f9bf2285 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_eTypeError, "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;
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index 688ffdaeba..a344da058c 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_eTypeError, "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 05b4890366..9fafaedb7e 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_eTypeError, "already initialized instance");
+    }
     rb_scan_args(argc, argv, "11", &source, &opts);
     source = convert_encoding(StringValue(source));
     ptr = RSTRING_PTR(source);
diff --git a/test/json/test_json.rb b/test/json/test_json.rb
index f5a432f8bd..4cf5972b58 100755
--- a/test/json/test_json.rb
+++ b/test/json/test_json.rb
@@ -337,4 +337,11 @@ EOT
     json5 = JSON([orig = 1 << 64])
     assert_equal orig, JSON[json5][0]
   end
+
+  def test_allocate
+    json = JSON::Parser.new("{}")
+    assert_raises(TypeError, '[ruby-core:35079]') {json.__send__(:initialize, "{}")}
+    json = JSON::Parser.allocate
+    assert_raises(TypeError, '[ruby-core:35079]') {json.source}
+  end
 end
diff --git a/version.h b/version.h
index b0df4821e3..ea9a34f850 100644
--- a/version.h
+++ b/version.h
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 192
+#define RUBY_PATCHLEVEL 193
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 1
-#define RUBY_RELEASE_DATE "2011-05-01"
+#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DATE "2011-05-12"
 
 #include "ruby/version.h"