json 1.0.4-mswin32 → 1.1.0-mswin32

data/CHANGES

@@ -1,3 +1,14 @@
+2007-05-21 (1.1.0)
+  * Implemented max_nesting feature for parser to avoid stack overflows for
+    data from untrusted sources. If you trust the source, you can disable it
+    with the option max_nesting => false.
+  * Piers Cawley <pdcawley@bofh.org.uk> reported a bug, that not every
+    character can be escaped by ?\ as required by RFC4627. There's a
+    contradiction between David Crockford's JSON checker test vectors (in
+    tests/fixtures) and RFC4627, though. I decided to stick to the RFC, because
+    the JSON checker seems to be a bit older than the RFC.
+  * Extended license to Ruby License, which includes the GPL.
+  * Added keyboard shortcuts, and 'Open location' menu item to edit_json.rb.
 2007-05-09 (1.0.4)
   * Applied a patch from Yui NARUSE <naruse@airemix.com> to make JSON compile
     under Ruby 1.9. Thank you very much for mailing it to me!
@@ -10,7 +21,7 @@
 2007-03-24 (1.0.2)
   * Ext Parser didn't parse 0e0 correctly into 0.0: Fixed!
 2007-03-24 (1.0.1)
-  * Forgot some object files in the build dir. I really like that- not!
+  * Forgot some object files in the build dir. I really like that - not!
 2007-03-24 (1.0.0)
   * Added C implementations for the JSON generator and a ragel based JSON
     parser in C.
@@ -25,7 +36,7 @@
     well.
   * Added aliases generate and pretty_generate of unparse and pretty_unparse.
   * Fixed a test case.
-  * Catch an Іconv::InvalidEncoding exception, that seems to occur on some Sun
+  * Catch an Iconv::InvalidEncoding exception, that seems to occur on some Sun
     boxes with SunOS 5.8, if iconv doesn't support utf16 conversions. This was
     reported by Andrew R Jackson <andrewj@bcm.tmc.edu>, thanks a bunch!
 2006-08-25 (0.4.2)

data/README

@@ -73,5 +73,6 @@ Florian Frank <flori@ping.de>
 License
 =======
 
-GNU General Public License (GPL), Version 2
-
+Ruby License, see the RUBY file included in the source distribution. The Ruby
+License includes the GNU General Public License (GPL), Version 2, so see the
+file GPL as well.

data/RUBY

@@ -0,0 +1,58 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING.txt file), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under this terms.
+
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory.  See each file for the copying
+     condition.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+

data/Rakefile

@@ -19,6 +19,7 @@ EXT_GENERATOR_DIR = "#{EXT_ROOT_DIR}/generator"
 EXT_GENERATOR_DL  = "#{EXT_ROOT_DIR}/generator.#{CONFIG['DLEXT']}"
 EXT_GENERATOR_SRC = "#{EXT_GENERATOR_DIR}/generator.c"
 RAGEL_CODEGEN     = %w[rlcodegen rlgen-cd].find { |c| system(c, '-v') }
+RAGEL_DOTGEN      = %w[rlgen-dot rlgen-cd].find { |c| system(c, '-v') }
 RAGEL_PATH        = "#{EXT_PARSER_DIR}/parser.rl"
 CLEAN.include 'doc', 'coverage', FileList['diagrams/*.*'],
   FileList["ext/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def}"],
@@ -94,7 +95,7 @@ task :ragel_dot_ps do
   specs = []
   File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
   for s in specs 
-    sh "ragel #{RAGEL_PATH} -S#{s} | #{RAGEL_CODEGEN} -p -V|dot -Tps -o#{root}/#{s}.ps"
+    sh "ragel #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tps -o#{root}/#{s}.ps"
   end
 end
 
@@ -104,7 +105,7 @@ task :ragel_dot_png do
   specs = []
   File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
   for s in specs 
-    sh "ragel #{RAGEL_PATH} -S#{s} | #{RAGEL_CODEGEN} -p -V|dot -Tpng -o#{root}/#{s}.png"
+    sh "ragel #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tpng -o#{root}/#{s}.png"
   end
 end
 
@@ -252,7 +253,7 @@ task :package_win => :compile do
     s.require_paths << 'lib'
 
     s.bindir = "bin"
-    s.executables = ["edit_json.rb"]
+    s.executables = ["edit_json.rb", "prettify_json.rb"]
     s.default_executable = "edit_json.rb"
 
     s.has_rdoc = true

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.1.0

data/ext/json/ext/generator/unicode.c

@@ -3,7 +3,7 @@
 #include "unicode.h"
 
 #define unicode_escape(buffer, character)          \
-    sprintf(buf, "\\u%04x", (unsigned int) (character)); \
+    snprintf(buf, 7, "\\u%04x", (unsigned int) (character)); \
          rb_str_buf_cat(buffer, buf, 6);
 
 /*

data/ext/json/ext/parser/parser.c

@@ -3,17 +3,14 @@
 
 #include "ruby.h"
 #include "re.h"
+#include "st.h"
 #include "unicode.h"
 
-#ifndef swap16
-#define swap16(x)	((((x)&0xFF)<<8) | (((x)>>8)&0xFF))
-#endif
-
 #define EVIL 0x666
 
-static VALUE mJSON, mExt, cParser, eParserError;
+static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
 
-static ID i_json_creatable_p, i_json_create, i_create_id, i_chr; 
+static ID i_json_creatable_p, i_json_create, i_create_id, i_chr, i_max_nesting; 
 
 typedef struct JSON_ParserStruct {
     VALUE Vsource;
@@ -21,6 +18,8 @@ typedef struct JSON_ParserStruct {
     long len;
     char *memo;
     VALUE create_id;
+    int max_nesting;
+    int current_nesting;
 } JSON_Parser;
 
 static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result);
@@ -34,34 +33,39 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
     JSON_Parser *json;                      \
     Data_Get_Struct(self, JSON_Parser, json);
 
-#line 59 "parser.rl"
+#line 58 "parser.rl"
 
 
 
-#line 42 "parser.c"
+#line 41 "parser.c"
 static const int JSON_object_start = 1;
 static const int JSON_object_first_final = 27;
 static const int JSON_object_error = 0;
 
 static const int JSON_object_en_main = 1;
 
-#line 92 "parser.rl"
+#line 91 "parser.rl"
 
 
 static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
     VALUE last_name = Qnil;
+
+    if (json->max_nesting && json->current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is to deep", json->current_nesting);
+    }
+
     *result = rb_hash_new();
 
     
-#line 59 "parser.c"
+#line 63 "parser.c"
 	{
 	cs = JSON_object_start;
 	}
-#line 101 "parser.rl"
+#line 105 "parser.rl"
     
-#line 65 "parser.c"
+#line 69 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
@@ -88,7 +92,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 78 "parser.rl"
+#line 77 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, &last_name);
         if (np == NULL) goto _out3; else {p = (( np))-1;}
@@ -98,7 +102,7 @@ st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
-#line 102 "parser.c"
+#line 106 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -163,7 +167,7 @@ case 8:
 		goto st8;
 	goto st0;
 tr11:
-#line 67 "parser.rl"
+#line 66 "parser.rl"
 	{
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, p, pe, &v); 
@@ -179,7 +183,7 @@ st9:
 	if ( ++p == pe )
 		goto _out9;
 case 9:
-#line 183 "parser.c"
+#line 187 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st9;
 		case 32: goto st9;
@@ -268,14 +272,14 @@ case 18:
 		goto st9;
 	goto st18;
 tr4:
-#line 83 "parser.rl"
+#line 82 "parser.rl"
 	{ goto _out27; }
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _out27;
 case 27:
-#line 279 "parser.c"
+#line 283 "parser.c"
 	goto st0;
 st19:
 	if ( ++p == pe )
@@ -372,7 +376,7 @@ case 26:
 
 	_out: {}
 	}
-#line 102 "parser.rl"
+#line 106 "parser.rl"
 
     if (cs >= JSON_object_first_final) {
         VALUE klassname = rb_hash_aref(*result, json->create_id);
@@ -389,14 +393,14 @@ case 26:
 }
 
 
-#line 393 "parser.c"
+#line 397 "parser.c"
 static const int JSON_value_start = 1;
 static const int JSON_value_first_final = 12;
 static const int JSON_value_error = 0;
 
 static const int JSON_value_en_main = 1;
 
-#line 167 "parser.rl"
+#line 177 "parser.rl"
 
 
 static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -404,13 +408,13 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
     
-#line 408 "parser.c"
+#line 412 "parser.c"
 	{
 	cs = JSON_value_start;
 	}
-#line 174 "parser.rl"
+#line 184 "parser.rl"
     
-#line 414 "parser.c"
+#line 418 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
@@ -432,14 +436,14 @@ case 1:
 st0:
 	goto _out0;
 tr0:
-#line 132 "parser.rl"
+#line 136 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, result);
         if (np == NULL) goto _out12; else {p = (( np))-1;}
     }
 	goto st12;
 tr2:
-#line 137 "parser.rl"
+#line 141 "parser.rl"
 	{
         char *np;
         np = JSON_parse_float(json, p, pe, result);
@@ -450,33 +454,39 @@ tr2:
     }
 	goto st12;
 tr3:
-#line 146 "parser.rl"
+#line 150 "parser.rl"
 	{ 
-        char *np = JSON_parse_array(json, p, pe, result);
+        char *np;
+        json->current_nesting += 1;
+        np = JSON_parse_array(json, p, pe, result);
+        json->current_nesting -= 1;
         if (np == NULL) goto _out12; else {p = (( np))-1;}
     }
 	goto st12;
 tr7:
-#line 151 "parser.rl"
+#line 158 "parser.rl"
 	{ 
-        char *np =  JSON_parse_object(json, p, pe, result);
+        char *np;
+        json->current_nesting += 1;
+        np =  JSON_parse_object(json, p, pe, result);
+        json->current_nesting -= 1;
         if (np == NULL) goto _out12; else {p = (( np))-1;}
     }
 	goto st12;
 tr11:
-#line 126 "parser.rl"
+#line 130 "parser.rl"
 	{
         *result = Qfalse;
     }
 	goto st12;
 tr14:
-#line 123 "parser.rl"
+#line 127 "parser.rl"
 	{
         *result = Qnil;
     }
 	goto st12;
 tr17:
-#line 129 "parser.rl"
+#line 133 "parser.rl"
 	{
         *result = Qtrue;
     }
@@ -485,9 +495,9 @@ st12:
 	if ( ++p == pe )
 		goto _out12;
 case 12:
-#line 156 "parser.rl"
+#line 166 "parser.rl"
 	{ goto _out12; }
-#line 491 "parser.c"
+#line 501 "parser.c"
 	goto st0;
 st2:
 	if ( ++p == pe )
@@ -575,7 +585,7 @@ case 11:
 
 	_out: {}
 	}
-#line 175 "parser.rl"
+#line 185 "parser.rl"
 
     if (cs >= JSON_value_first_final) {
         return p;
@@ -585,14 +595,14 @@ case 11:
 }
 
 
-#line 589 "parser.c"
+#line 599 "parser.c"
 static const int JSON_integer_start = 1;
 static const int JSON_integer_first_final = 5;
 static const int JSON_integer_error = 0;
 
 static const int JSON_integer_en_main = 1;
 
-#line 191 "parser.rl"
+#line 201 "parser.rl"
 
 
 static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -600,14 +610,14 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
     int cs = EVIL;
 
     
-#line 604 "parser.c"
+#line 614 "parser.c"
 	{
 	cs = JSON_integer_start;
 	}
-#line 198 "parser.rl"
+#line 208 "parser.rl"
     json->memo = p;
     
-#line 611 "parser.c"
+#line 621 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
@@ -640,14 +650,14 @@ case 3:
 		goto st0;
 	goto tr4;
 tr4:
-#line 188 "parser.rl"
+#line 198 "parser.rl"
 	{ goto _out5; }
 	goto st5;
 st5:
 	if ( ++p == pe )
 		goto _out5;
 case 5:
-#line 651 "parser.c"
+#line 661 "parser.c"
 	goto st0;
 st4:
 	if ( ++p == pe )
@@ -665,7 +675,7 @@ case 4:
 
 	_out: {}
 	}
-#line 200 "parser.rl"
+#line 210 "parser.rl"
 
     if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
@@ -677,14 +687,14 @@ case 4:
 }
 
 
-#line 681 "parser.c"
+#line 691 "parser.c"
 static const int JSON_float_start = 1;
 static const int JSON_float_first_final = 10;
 static const int JSON_float_error = 0;
 
 static const int JSON_float_en_main = 1;
 
-#line 222 "parser.rl"
+#line 232 "parser.rl"
 
 
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -692,14 +702,14 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
     
-#line 696 "parser.c"
+#line 706 "parser.c"
 	{
 	cs = JSON_float_start;
 	}
-#line 229 "parser.rl"
+#line 239 "parser.rl"
     json->memo = p;
     
-#line 703 "parser.c"
+#line 713 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
@@ -756,14 +766,14 @@ case 5:
 		goto st0;
 	goto tr7;
 tr7:
-#line 216 "parser.rl"
+#line 226 "parser.rl"
 	{ goto _out10; }
 	goto st10;
 st10:
 	if ( ++p == pe )
 		goto _out10;
 case 10:
-#line 767 "parser.c"
+#line 777 "parser.c"
 	goto st0;
 st6:
 	if ( ++p == pe )
@@ -823,7 +833,7 @@ case 9:
 
 	_out: {}
 	}
-#line 231 "parser.rl"
+#line 241 "parser.rl"
 
     if (cs >= JSON_float_first_final) {
         long len = p - json->memo;
@@ -836,29 +846,33 @@ case 9:
 
 
 
-#line 840 "parser.c"
+#line 850 "parser.c"
 static const int JSON_array_start = 1;
 static const int JSON_array_first_final = 17;
 static const int JSON_array_error = 0;
 
 static const int JSON_array_en_main = 1;
 
-#line 267 "parser.rl"
+#line 277 "parser.rl"
 
 
 static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
+
+    if (json->max_nesting && json->current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is to deep", json->current_nesting);
+    }
     *result = rb_ary_new();
 
     
-#line 856 "parser.c"
+#line 870 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
-#line 275 "parser.rl"
+#line 289 "parser.rl"
     
-#line 862 "parser.c"
+#line 876 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
@@ -894,7 +908,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 248 "parser.rl"
+#line 258 "parser.rl"
 	{
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, p, pe, &v); 
@@ -910,7 +924,7 @@ st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
-#line 914 "parser.c"
+#line 928 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -1008,14 +1022,14 @@ case 12:
 		goto st3;
 	goto st12;
 tr4:
-#line 259 "parser.rl"
+#line 269 "parser.rl"
 	{ goto _out17; }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _out17;
 case 17:
-#line 1019 "parser.c"
+#line 1033 "parser.c"
 	goto st0;
 st13:
 	if ( ++p == pe )
@@ -1070,7 +1084,7 @@ case 16:
 
 	_out: {}
 	}
-#line 276 "parser.rl"
+#line 290 "parser.rl"
 
     if(cs >= JSON_array_first_final) {
         return p + 1;
@@ -1079,7 +1093,7 @@ case 16:
     }
 }
 
-static VALUE json_string_escape(char *p, char *pe)
+static VALUE json_string_unescape(char *p, char *pe)
 {
     VALUE result = rb_str_buf_new(pe - p + 1);
 
@@ -1120,6 +1134,10 @@ static VALUE json_string_escape(char *p, char *pe)
                         p = JSON_convert_UTF16_to_UTF8(result, p, pe, strictConversion);
                     }
                     break;
+                default:
+                    rb_str_buf_cat(result, p, 1);
+                    p++;
+                    break;
             }
         } else {
             char *q = p;
@@ -1132,14 +1150,14 @@ static VALUE json_string_escape(char *p, char *pe)
 }
 
 
-#line 1136 "parser.c"
+#line 1154 "parser.c"
 static const int JSON_string_start = 1;
 static const int JSON_string_first_final = 8;
 static const int JSON_string_error = 0;
 
 static const int JSON_string_en_main = 1;
 
-#line 350 "parser.rl"
+#line 368 "parser.rl"
 
 
 static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -1148,14 +1166,14 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     *result = rb_str_new("", 0);
     
-#line 1152 "parser.c"
+#line 1170 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
-#line 358 "parser.rl"
+#line 376 "parser.rl"
     json->memo = p;
     
-#line 1159 "parser.c"
+#line 1177 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
@@ -1179,36 +1197,29 @@ case 2:
 		goto st0;
 	goto st2;
 tr2:
-#line 342 "parser.rl"
+#line 360 "parser.rl"
 	{
-        *result = json_string_escape(json->memo + 1, p);
+        *result = json_string_unescape(json->memo + 1, p);
         if (NIL_P(*result)) goto _out8; else {p = (( p + 1))-1;}
     }
-#line 347 "parser.rl"
+#line 365 "parser.rl"
 	{ goto _out8; }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _out8;
 case 8:
-#line 1195 "parser.c"
+#line 1213 "parser.c"
 	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _out3;
 case 3:
-	switch( (*p) ) {
-		case 34: goto st2;
-		case 47: goto st2;
-		case 92: goto st2;
-		case 98: goto st2;
-		case 102: goto st2;
-		case 110: goto st2;
-		case 114: goto st2;
-		case 116: goto st2;
-		case 117: goto st4;
-	}
-	goto st0;
+	if ( (*p) == 117 )
+		goto st4;
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto st2;
 st4:
 	if ( ++p == pe )
 		goto _out4;
@@ -1273,7 +1284,7 @@ case 7:
 
 	_out: {}
 	}
-#line 360 "parser.rl"
+#line 378 "parser.rl"
 
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -1284,14 +1295,14 @@ case 7:
 
 
 
-#line 1288 "parser.c"
+#line 1299 "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 390 "parser.rl"
+#line 412 "parser.rl"
 
 
 /* 
@@ -1307,21 +1318,51 @@ static const int JSON_en_main = 1;
  */
 
 /*
- * call-seq: new(source)
+ * call-seq: new(source, opts => {})
+ *
+ * Creates a new JSON::Ext::Parser instance for the string _source_.
  *
  * Creates a new JSON::Ext::Parser instance for the string _source_.
+ *
+ * It will be configured by the _opts_ hash. _opts_ can have the following
+ * keys:
+ *
+ * _opts_ can have the following keys:
+ * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
+ *   structures. Disable depth checking with :max_nesting => false.
  */
-static VALUE cParser_initialize(VALUE self, VALUE source)
+static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 {
     char *ptr;
     long len;
+    VALUE source, opts;
     GET_STRUCT;
+    rb_scan_args(argc, argv, "11", &source, &opts);
     source = StringValue(source);
     ptr = RSTRING_PTR(source);
     len = RSTRING_LEN(source);
     if (len < 2) {
         rb_raise(eParserError, "A JSON text must at least contain two octets!");
     }
+    json->max_nesting = 19;
+    if (!NIL_P(opts)) {
+        opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
+        if (NIL_P(opts)) {
+            rb_raise(rb_eArgError, "opts needs to be like a hash");
+        } else {
+            VALUE s_max_nesting = ID2SYM(i_max_nesting);
+            if (st_lookup(RHASH(opts)->tbl, s_max_nesting, 0)) {
+                VALUE max_nesting = rb_hash_aref(opts, s_max_nesting);
+                if (RTEST(max_nesting)) {
+                    Check_Type(max_nesting, T_FIXNUM);
+                    json->max_nesting = FIX2INT(max_nesting);
+                } else {
+                    json->max_nesting = 0;
+                }
+            }
+        }
+    }
+    json->current_nesting = 0;
     /*
        Convert these?
     if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
@@ -1355,15 +1396,15 @@ static VALUE cParser_parse(VALUE self)
     GET_STRUCT;
 
     
-#line 1359 "parser.c"
+#line 1400 "parser.c"
 	{
 	cs = JSON_start;
 	}
-#line 453 "parser.rl"
+#line 505 "parser.rl"
     p = json->source;
     pe = p + json->len;
     
-#line 1367 "parser.c"
+#line 1408 "parser.c"
 	{
 	if ( p == pe )
 		goto _out;
@@ -1418,16 +1459,20 @@ case 5:
 		goto st1;
 	goto st5;
 tr3:
-#line 381 "parser.rl"
+#line 401 "parser.rl"
 	{
-        char *np = JSON_parse_array(json, p, pe, &result);
+        char *np;
+        json->current_nesting = 1;
+        np = JSON_parse_array(json, p, pe, &result);
         if (np == NULL) goto _out10; else {p = (( np))-1;}
     }
 	goto st10;
 tr4:
-#line 376 "parser.rl"
+#line 394 "parser.rl"
 	{
-        char *np = JSON_parse_object(json, p, pe, &result);
+        char *np;
+        json->current_nesting = 1;
+        np = JSON_parse_object(json, p, pe, &result);
         if (np == NULL) goto _out10; else {p = (( np))-1;}
     }
 	goto st10;
@@ -1435,7 +1480,7 @@ st10:
 	if ( ++p == pe )
 		goto _out10;
 case 10:
-#line 1439 "parser.c"
+#line 1484 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -1491,7 +1536,7 @@ case 9:
 
 	_out: {}
 	}
-#line 456 "parser.rl"
+#line 508 "parser.rl"
 
     if (cs >= JSON_first_final && p == pe) {
         return result;
@@ -1542,8 +1587,9 @@ void Init_parser()
     mExt = rb_define_module_under(mJSON, "Ext");
     cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
     eParserError = rb_path2class("JSON::ParserError");
+    eNestingError = rb_path2class("JSON::NestingError");
     rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
-    rb_define_method(cParser, "initialize", cParser_initialize, 1);
+    rb_define_method(cParser, "initialize", cParser_initialize, -1);
     rb_define_method(cParser, "parse", cParser_parse, 0);
     rb_define_method(cParser, "source", cParser_source, 0);
 
@@ -1551,4 +1597,5 @@ void Init_parser()
     i_json_create = rb_intern("json_create");
     i_create_id = rb_intern("create_id");
     i_chr = rb_intern("chr");
+    i_max_nesting = rb_intern("max_nesting");
 }