oj 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88d1b989da1bbd42c7fa90ba96baa9c71f289631
-  data.tar.gz: 2d1643092b53fbf33db538856179f7385516346e
+  metadata.gz: 47818e1b552b974e400bd82db1723ecf930100ed
+  data.tar.gz: 48f46104df400dab9f9b1c838b7247d68b34c1c3
 SHA512:
-  metadata.gz: 6433a3aa13a1afdabda2e44c732cc85989a38772702edf5ca70a984e9dbdc275f7a255cb405897e8b6898aced26490f11c17b55413638dd885bba2c9a7ed8a54
-  data.tar.gz: 79540125a8c5a1553622f786e5aee3a12c8e256060f545a87ae0d9bb5896ab7dc0e5bb4bcdc1f72d6a354d35c5a536adb8cde20bc11a128464405460b8e8a112
+  metadata.gz: fa8d739990ecce865cf95bd363a6464b343cd29d6ab8af6a1bf19e3dd21029d8000f990084a03990822e3f7c88e3164476e7e2b9d8295b2d0e36a5b0dadf5194
+  data.tar.gz: a02d4f7b1b07caee178e7ec726dedaa481c5c429777dc4be0f2ba9ed361aab57e040ad4ce1abd2e71d79836bad57702f32b180703ffae46e4e0f939e30c397c9

data/README.md

@@ -26,12 +26,11 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-### Current Release 2.6.0
+### Current Release 2.6.1
 
- - Added the `:use_to_json` option for Oj.dump(). If this option is set to false
-   the `to_json()` method on objects will not be calledwhen dumping. This is the
-   default behavior. The reason behind the option and change is to better
-   support Rails and ActiveSupport. Previous works arounds have been removed.
+ - Set a limit on the maximum nesting depth to 1000. An exception is raised
+   instead of a segfault unless a reduced stack is used which could trigger the
+   segfault due to an out of memory condition.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -54,6 +54,8 @@
 // Extra padding at end of buffer.
 #define BUFFER_EXTRA 10
 
+#define MAX_DEPTH 1000
+
 typedef unsigned long	ulong;
 
 static void	raise_strict(VALUE obj);
@@ -182,19 +184,6 @@ fill_indent(Out out, int cnt) {
     }
 }
 
-inline static const char*
-ulong2str(uint32_t num, char *end) {
-    char	*b;
-
-    *end-- = '\0';
-    for (b = end; 0 < num || b == end; num /= 10, b--) {
-	*b = (num % 10) + '0';
-    }
-    b++;
-
-    return b;
-}
-
 inline static void
 dump_ulong(unsigned long num, Out out) {
     char	buf[32];
@@ -1620,6 +1609,9 @@ raise_strict(VALUE obj) {
 
 static void
 dump_val(VALUE obj, int depth, Out out) {
+    if (MAX_DEPTH < depth) {
+	rb_raise(rb_eNoMemError, "Too deeply nested.\n");
+    }
     switch (rb_type(obj)) {
     case T_NIL:		dump_nil(out);			break;
     case T_TRUE:	dump_true(out);			break;

data/ext/oj/fast.c

@@ -147,23 +147,6 @@ next_non_white(ParseInfo pi) {
     }
 }
 
-inline static void
-next_white(ParseInfo pi) {
-    for (; 1; pi->s++) {
-	switch(*pi->s) {
-	case ' ':
-	case '\t':
-	case '\f':
-	case '\n':
-	case '\r':
-	case '\0':
-	    return;
-	default:
-	    break;
-	}
-    }
-}
-
 inline static char*
 ulong_fill(char *s, size_t num) {
     char	buf[32];

data/ext/oj/saj.c

@@ -120,23 +120,6 @@ next_non_white(ParseInfo pi) {
     }
 }
 
-inline static void
-next_white(ParseInfo pi) {
-    for (; 1; pi->s++) {
-	switch(*pi->s) {
-	case ' ':
-	case '\t':
-	case '\f':
-	case '\n':
-	case '\r':
-	case '\0':
-	    return;
-	default:
-	    break;
-	}
-    }
-}
-
 inline static void
 call_add_value(VALUE handler, VALUE value, const char *key) {
     volatile VALUE	k;

data/lib/oj/version.rb

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

data/test/test_saj.rb

@@ -178,7 +178,7 @@ class SajTest < ::Test::Unit::TestCase
     json = %{12345xyz}
     Oj.saj_parse(handler, json)
     assert_equal([[:add_value, 12345, nil],
-                  [:error, "invalid format, extra characters at line 1, column 6 [saj.c:705]", 1, 6]], handler.calls)
+                  [:error, "invalid format, extra characters at line 1, column 6 [saj.c:688]", 1, 6]], handler.calls)
   end
 
 end

data/test/tests.rb

@@ -1023,6 +1023,18 @@ class Juice < ::Test::Unit::TestCase
     end
   end
 
+  def test_deep_nest_dump
+    begin
+      a = []
+      10000.times { a << [a] }
+      Oj.dump(a)
+    rescue Exception => e
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
 # Stream IO
   def test_io_string
     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -128,3 +128,4 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
+has_rdoc: true