oj 3.6.10 → 3.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a87c62472d113e29856309232619790b751b188625b5f8500188f3d33225ceb
-  data.tar.gz: aaa3439fab55eb25f6ea54a4dc200dc0a97df79a5d0e1b8a1cd5b2a04550b8f7
+  metadata.gz: cef33c35dc056f48604161c781e420fcd13b54e2f674aa3f9722e1c8bc25cfc2
+  data.tar.gz: 96425922ddda704b173f52fae3c897f1574b373784bf5cb5be18d8223f03bef0
 SHA512:
-  metadata.gz: f3dbefcb405bb2283b099206a5916970f4a06afc69354a1a3a3330ee45b1c0d4c6a9799626775131e85ca3a3b8ac93ff2663cddc81253f00a611d0e562626833
-  data.tar.gz: 2c4fb14af2b3840c69695998091ad25163ad3325e42d777c1a133ed427fac22ec096e2ed9d235f0814f0c8c2de5bfff823d0e12d1f2081ef66dfd74acb49d6b9
+  metadata.gz: b18e9dbf9b3fb6082210470e560384b1fe5547e35e615fc8717c23342d003ce2923de22d263ae37e708c080ba0d92f75d3be374d7197a49ec79ab619e677cdbe
+  data.tar.gz: bb9c2884eff2f1e841b6a31339b2e19f92680309ea7042bb7b44bb6a31a4ba5f963106099ce2bb58e9705ec25d60dbe82149c009b830133e6569aa78745bfd3a

data/ext/oj/parse.c

@@ -796,12 +796,42 @@ oj_num_as_value(NumInfo ni) {
 void
 oj_set_error_at(ParseInfo pi, VALUE err_clas, const char* file, int line, const char *format, ...) {
     va_list	ap;
-    char	msg[128];
+    char	msg[256];
+    char	*p = msg;
+    char	*end = p + sizeof(msg) - 2;
+    char	*start;
+    Val		vp;
 
     va_start(ap, format);
-    vsnprintf(msg, sizeof(msg) - 1, format, ap);
+    p += vsnprintf(msg, sizeof(msg) - 1, format, ap);
     va_end(ap);
     pi->err.clas = err_clas;
+    if (p + 3 < end) {
+	*p++ = ' ';
+	*p++ = '(';
+	start = p;
+	for (vp = pi->stack.head; vp < pi->stack.tail; vp++) {
+	    if (end <= p + 1 + vp->klen) {
+		break;
+	    }
+	    if (NULL != vp->key) {
+		if (start < p) {
+		    *p++ = '.';
+		}
+		memcpy(p, vp->key, vp->klen);
+		p += vp->klen;
+	    } else {
+		if (RUBY_T_ARRAY == rb_type(vp->val)) {
+		    if (end <= p + 12) {
+			break;
+		    }
+		    p += snprintf(p, end - p, "[%ld]", RARRAY_LEN(vp->val));
+		}		    
+	    }
+	}
+	*p++ = ')';
+    }
+    *p = '\0';
     if (0 == pi->json) {
 	oj_err_set(&pi->err, err_clas, "%s at line %d, column %d [%s:%d]", msg, pi->rd.line, pi->rd.col, file, line);
     } else {
@@ -936,23 +966,31 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
     if (!err_has(&pi->err)) {
 	// If the stack is not empty then the JSON terminated early.
 	Val	v;
+	VALUE	err_class = oj_parse_error_class;
+
+	if (0 != line) {
+	    VALUE	ec = rb_obj_class(rb_errinfo());
 
-	if (0 != (v = stack_peek(&pi->stack))) {
+	    if (rb_eArgError != ec) {
+		err_class = ec;
+	    }
+	}
+	if (NULL != (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");
+		oj_set_error_at(pi, err_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");
+		oj_set_error_at(pi, err_class, __FILE__, __LINE__, "Hash/Object not terminated");
 		break;
 	    default:
-		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not terminated");
+		oj_set_error_at(pi, err_class, __FILE__, __LINE__, "not terminated");
 	    }
 	}
     }
@@ -969,9 +1007,6 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
     if (pi->str_rx.head != oj_default_options.str_rx.head) {
 	oj_rxclass_cleanup(&pi->str_rx);
     }
-    if (0 != line) {
-	rb_jump_tag(line);
-    }
     if (err_has(&pi->err)) {
 	if (Qnil != pi->err_class) {
 	    pi->err.clas = pi->err_class;
@@ -992,6 +1027,8 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
 	} else {
 	    oj_err_raise(&pi->err);
 	}
+    } else if (0 != line) {
+	rb_jump_tag(line);
     }
     if (pi->options.quirks_mode == No) {
 	switch (rb_type(result)) {

data/ext/oj/sparse.c

@@ -839,23 +839,31 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
     if (!err_has(&pi->err)) {
 	// If the stack is not empty then the JSON terminated early.
 	Val	v;
+	VALUE	err_class = oj_parse_error_class;
 
+	if (0 != line) {
+	    VALUE	ec = rb_obj_class(rb_errinfo());
+
+	    if (rb_eArgError != ec) {
+		err_class = ec;
+	    }
+	}
 	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");
+		oj_set_error_at(pi, err_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");
+		oj_set_error_at(pi, err_class, __FILE__, __LINE__, "Hash/Object not terminated");
 		break;
 	    default:
-		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not terminated");
+		oj_set_error_at(pi, err_class, __FILE__, __LINE__, "not terminated");
 	    }
 	}
     }
@@ -867,9 +875,6 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
     if (0 != fd) {
 	close(fd);
     }
-    if (0 != line) {
-	rb_jump_tag(line);
-    }
     if (err_has(&pi->err)) {
 	if (Qnil != pi->err_class) {
 	    pi->err.clas = pi->err_class;
@@ -886,8 +891,9 @@ oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd) {
 	} else {
 	    oj_err_raise(&pi->err);
 	}
-
 	oj_err_raise(&pi->err);
+    } else if (0 != line) {
+	rb_jump_tag(line);
     }
     return result;
 }

data/lib/oj/version.rb

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

data/test/test_scp.rb

@@ -346,6 +346,16 @@ class ScpTest < Minitest::Test
     end
   end
 
+  def test_bad_bignum
+    if '2.4.0' < RUBY_VERSION
+      handler = AllHandler.new()
+      json = %|{"big":-e123456789}|
+      assert_raises Oj::ParseError do
+	Oj.sc_parse(handler, json)
+      end
+    end
+  end
+
   def test_pipe_close
     # Windows does not support fork
     return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/

data/test/test_various.rb

@@ -29,7 +29,7 @@ class Juice < Minitest::Test
     end
     alias == eql?
 
-  end# Jam
+  end # Jam
 
   class Jeez < Jam
     def initialize(x, y)
@@ -43,7 +43,7 @@ class Juice < Minitest::Test
     def self.json_create(h)
       self.new(h['x'], h['y'])
     end
-  end# Jeez
+  end # Jeez
 
   # contributed by sauliusg to fix as_json
   class Orange < Jam
@@ -86,7 +86,7 @@ class Juice < Minitest::Test
     def self.json_create(h)
       self.new(h['x'], h['y'])
     end
-  end# Jazz
+  end # Jazz
 
   def setup
     @default_options = Oj.default_options
@@ -661,6 +661,29 @@ class Juice < Minitest::Test
     assert_equal('string', Oj.load('"string"', :quirks_mode => true))
   end
 
+  def test_error_path
+    msg = ''
+    assert_raises(Oj::ParseError) {
+      begin
+	Oj.load(%|{
+  "first": [
+    1, 2, { "third": 123x }
+  ]
+}|)
+      rescue Oj::ParseError => e
+	msg = e.message
+	raise e
+      end
+    }
+    assert_equal('first[2].third', msg.split('(')[1].split(')')[0])
+  end
+
+  def test_bad_bignum
+    if '2.4.0' < RUBY_VERSION
+      assert_raises(Oj::ParseError) { Oj.load(%|{ "big": -e123456789 }|) }
+    end
+  end
+
   def test_quirks_array_mode
     assert_equal([], Oj.load("[]", :quirks_mode => false))
     assert_equal([], Oj.load("[]", :quirks_mode => true))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.6.10
+  version: 3.6.11
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler