oj 2.0.6 → 2.0.7

data/README.md

@@ -32,6 +32,11 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
+### Release 2.0.7
+
+ - Fixed bug where undefined classes specified in a JSON document would freeze Ruby instead of raising an exception when
+   the auto_define option was not set. (It seems that Ruby freezes on trying to add variables to nil.)
+
 ### Release 2.0.6
 
  - Worked around an undocumented feature in linux when using make that misreports the stack limits.

data/ext/oj/load.c

@@ -184,7 +184,10 @@ classname2class(const char *name, ParseInfo pi) {
 		    raise_error("Invalid classname, expected another ':'", pi->str, pi->s);
 		}
 		if (Qundef == (clas = resolve_classname(clas, class_name, auto_define))) {
-		    return Qundef;
+		    char	buf[1024];
+
+		    snprintf(buf, sizeof(buf) - 1, "Class %s not defined", class_name);
+		    raise_error(buf, pi->str, pi->s);
 		}
 		s = class_name;
 	    } else if (end <= s) {

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

data/test/bug.rb

@@ -1,4 +1,25 @@
-require 'oj'
-puts Oj.load('{}')
 
+require 'pp'
+require 'oj'
 
+pp Oj.load("{\"id\": 303628670768128001,
+\"additionalType\":\"http://getfetcher.net/Item\",
+\"description\":\"@DoMeuBieber :)) mas kra pode parando d fazer isso ainda mais por causa d mlk eu sei que no  sua culpa mas vc pode evitar!\",
+\"author\": {\"additionalType\":\"http://getfetcher.net/Item\",
+\"id\":1054045717,
+\"name\":\"i'm natriznator\",
+\"dateRegistered\":{\"^t\":1357095124.000000000},
+\"description\":\"menos falsidade e mais liberdade\",
+\"url\":\"https://twitter.com/hotlov4to\"},
+\"viewer\": {\"additionalType\":\"http://getfetcher.net/Item\",
+\"id\":861875166,
+\"name\":\"Fetcher Dev\",
+\"dateRegistered\":{\"^t\":1349377226.000000000},
+\"description\":null,
+\"url\":\"https://twitter.com/FetcherDev\"},
+\"dateCreated\": {\"^t\":1361225690.000000000},
+\"provider\": [\"twitter\",
+\"web\"],
+\"url\": \"https://twitter.com/hotlov4to/status/303628670768128001\",
+\"_id\": {\"^o\":\"BSON::ObjectId\",
+\"data\":[81,34,167,251,70,246,92,80,135,0,0,1]}}", :auto_define => false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors: