oj 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4165ecef265108d14800378477125c41841e728
-  data.tar.gz: 6ba913e644eba9a2aad1661b325bfab916eb5538
+  metadata.gz: c5ed2da87bfa647cc35c9f601be6ad196d55d383
+  data.tar.gz: 10861e340f51bb1179829e04187115bf4c147370
 SHA512:
-  metadata.gz: 822357deaa522c3fcbf1971c6c5f791904d9b083afe8b8bea4c96a7f6bf7b2101bd0114c614e291943a9a8f48571824c49133f94a7dc1279c9e342e8a6d7f1e4
-  data.tar.gz: 5727942d444faa502f69bf3875e1c3c9b3176ea4fa2d6caaa26ed74cab3fea32d49780cf6e83687946d7d43bae91c3969efee2e3add96d77c011d78ed15c8869
+  metadata.gz: 96b24f234c6f96ea1744d5696dce1544e9be1c8c99d0c25343727cb1302c0097e5cd2425a6a04335f4d662862c557d6e02daff06568e2b0b03c630f6fd8f9787
+  data.tar.gz: f87d369229b94e0ebaec6c2a8fffad056f1a41de63c108eacd4919166f743a74cb914622d2ac702bfe80511a029832c8247991ed896fdb61342341c776f12239

data/README.md

@@ -20,17 +20,9 @@ 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.5.3
+### Current Release 2.5.4
 
- - Added support for blocks with StringWriter
-
-### Current Release 2.5.2
-
- - Fixed indent problem with StringWriter so it now indents properly
-
-### Current Release 2.5.1
-
- - Added push_json() to the StringWriter and StreamWriter to allow raw JSON to be added to a JSON document being constructed.
+ - Fixed bug where unterminated JSON did not raise an exception.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/oj.c

@@ -1781,6 +1781,12 @@ void Init_oj() {
     oj_utc_offset_id = rb_intern("utc_offset");
     oj_write_id = rb_intern("write");
 
+    rb_require("oj/bag");
+    rb_require("oj/error");
+    rb_require("oj/mimic");
+    rb_require("oj/saj");
+    rb_require("oj/schandler");
+
     oj_bag_class = rb_const_get_at(Oj, rb_intern("Bag"));
     oj_bigdecimal_class = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
     oj_date_class = rb_const_get(rb_cObject, rb_intern("Date"));

data/ext/oj/parse.c

@@ -799,6 +799,29 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len) {
     if (No == pi->options.allow_gc) {
 	rb_gc_enable();
     }
+    {
+	// If the stack is not empty then the JSON terminated early.
+	Val	v;
+
+	if (0 != (v = stack_peek(&pi->stack))) {
+	    switch (v->next) {
+	    case NEXT_ARRAY_NEW:
+	    case NEXT_ARRAY_ELEMENT:
+	    case NEXT_ARRAY_COMMA:
+		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "Array not terminated");
+		break;
+	    case NEXT_HASH_NEW:
+	    case NEXT_HASH_KEY:
+	    case NEXT_HASH_COLON:
+	    case NEXT_HASH_VALUE:
+	    case NEXT_HASH_COMMA:
+		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "Hash/Object not terminated");
+		break;
+	    default:
+		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not terminated");
+	    }
+	}
+    }
     // proceed with cleanup
     if (0 != pi->circ_array) {
 	oj_circ_array_free(pi->circ_array);

data/lib/oj/version.rb

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

data/test/tests.rb

@@ -253,6 +253,15 @@ class Juice < ::Test::Unit::TestCase
     dump_and_load([[nil]], false)
     dump_and_load([[nil], 58], false)
   end
+  def test_array_not_closed
+    begin
+      Oj.load('[')
+    rescue Exception => e
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
 
   # rails encoding tests
   def test_does_not_escape_entities_by_default
@@ -314,10 +323,11 @@ class Juice < ::Test::Unit::TestCase
     t = Time.local(2012, 1, 5, 23, 58, 7)
     begin
       Oj.dump(t, :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_time_null
     t = Time.local(2012, 1, 5, 23, 58, 7)
@@ -459,10 +469,11 @@ class Juice < ::Test::Unit::TestCase
   def test_class_strict
     begin
       Oj.dump(Juice, :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_class_null
     json = Oj.dump(Juice, :mode => :null)
@@ -487,18 +498,20 @@ class Juice < ::Test::Unit::TestCase
   def test_non_str_hash_strict
     begin
       Oj.dump({ 1 => true, 0 => false }, :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_non_str_hash_null
     begin
       Oj.dump({ 1 => true, 0 => false }, :mode => :null)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_non_str_hash_compat
     json = Oj.dump({ 1 => true, 0 => false }, :mode => :compat)
@@ -521,16 +534,26 @@ class Juice < ::Test::Unit::TestCase
     h = Oj.load(json)
     assert_equal({ 1 => true, 'nil' => nil, :sim => 4 }, h)
   end
+  def test_hash_not_closed
+    begin
+      Oj.load('{')
+    rescue Exception => e
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
 
   # Object with to_json()
   def test_json_object_strict
     obj = Jeez.new(true, 58)
     begin
       Oj.dump(obj, :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_json_object_null
     obj = Jeez.new(true, 58)
@@ -575,10 +598,11 @@ class Juice < ::Test::Unit::TestCase
     obj = Jazz.new(true, 58)
     begin
       Oj.dump(obj, :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_to_hash_object_null
     obj = Jazz.new(true, 58)
@@ -613,10 +637,11 @@ class Juice < ::Test::Unit::TestCase
     obj = Orange.new(true, 58)
     begin
       Oj.dump(obj, :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
 
   def test_as_json_object_null
@@ -662,10 +687,11 @@ class Juice < ::Test::Unit::TestCase
     obj = Jam.new(true, 58)
     begin
       Oj.dump(obj, :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_object_null
     obj = Jam.new(true, 58)
@@ -723,7 +749,6 @@ class Juice < ::Test::Unit::TestCase
     err = nil
     begin
       raise StandardError.new('A Message')
-      assert(false)
     rescue Exception => e
       err = e
     end
@@ -747,10 +772,11 @@ class Juice < ::Test::Unit::TestCase
   def test_range_strict
     begin
       Oj.dump(1..7, :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_range_null
     json = Oj.dump(1..7, :mode => :null)
@@ -862,10 +888,11 @@ class Juice < ::Test::Unit::TestCase
   def test_date_strict
     begin
       Oj.dump(Date.new(2012, 6, 19), :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_date_null
     json = Oj.dump(Date.new(2012, 6, 19), :mode => :null)
@@ -891,10 +918,11 @@ class Juice < ::Test::Unit::TestCase
   def test_datetime_strict
     begin
       Oj.dump(DateTime.new(2012, 6, 19, 20, 19, 27), :mode => :strict)
-      assert(false)
     rescue Exception
       assert(true)
+      return
     end
+    assert(false, "*** expected an exception")
   end
   def test_datetime_null
     json = Oj.dump(DateTime.new(2012, 6, 19, 20, 19, 27), :mode => :null)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com