oj 2.0.5 → 2.0.6

data/README.md

@@ -32,6 +32,10 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
+### Release 2.0.6
+
+ - Worked around an undocumented feature in linux when using make that misreports the stack limits.
+
 ### Release 2.0.5
 
  - DateTimes are now output the same in compat mode for both 1.8.7 and 1.9.3 even though they are implemented differently in each Ruby.

data/ext/oj/load.c

@@ -62,7 +62,7 @@ typedef struct _ParseInfo {
     char	*s;		/* current position in buffer */
     CircArray	circ_array;
     Options	options;
-    void	*stack_min;
+    char	*stack_min;
 } *ParseInfo;
 
 static CircArray	circ_array_new(void);
@@ -328,7 +328,7 @@ static VALUE
 read_next(ParseInfo pi, int hint) {
     VALUE	obj;
 
-    if ((void*)&obj < pi->stack_min) {
+    if ((char*)&obj < pi->stack_min) {
 	rb_raise(rb_eSysStackError, "JSON is too deeply nested");
     }
     next_non_white(pi);	// skip white space
@@ -1039,12 +1039,14 @@ oj_parse(char *json, Options options) {
     }
     pi.options = options;
 #if IS_WINDOWS
-    pi.stack_min = (void*)((char*)&obj - (512 * 1024)); // assume a 1M stack and give half to ruby
+    pi.stack_min = (char*)&obj - (512 * 1024); // assume a 1M stack and give half to ruby
 #else
     {
 	struct rlimit	lim;
 
-	if (0 == getrlimit(RLIMIT_STACK, &lim)) {
+	// When run under make on linux the limit is not reported corrected and is infinity even though
+	// the return code indicates no error. That forces the rlim_cur value as well as the return code.
+	if (0 == getrlimit(RLIMIT_STACK, &lim) && RLIM_INFINITY != lim.rlim_cur) {
 	    pi.stack_min = (void*)((char*)&obj - (lim.rlim_cur / 4 * 3)); // let 3/4ths of the stack be used only
 	} else {
 	    pi.stack_min = 0; // indicates not to check stack limit

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -1,2 +1,4 @@
-Oj.load(%{{"json_class":"#{'x'*1300}"}})
+require 'oj'
+puts Oj.load('{}')
+
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com