Merge branch 'master' of github.com:ohler55/oj

daniilfranks · Nov 16, 2015 · 447d2ad · 447d2ad
2 parents b0b75cf + 0177cd2
commit 447d2ad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ext/oj/dump.c b/ext/oj/dump.c
@@ -1786,9 +1786,12 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
     size = d3 * out->indent + 2;
 #ifdef RSTRUCT_LEN
     {
-	VALUE	*vp;
+	const VALUE	*vp;
 
-	for (i = (int)RSTRUCT_LEN(obj), vp = RSTRUCT_PTR(obj); 0 < i; i--, vp++) {
+#ifndef RSTRUCT_CONST_PTR
+# define RSTRUCT_CONST_PTR(st) (const VALUE *)RSTRUCT_PTR(st)
+#endif
+	for (i = (int)RSTRUCT_LEN(obj), vp = RSTRUCT_CONST_PTR(obj); 0 < i; i--, vp++) {
 	    if (out->end - out->cur <= (long)size) {
 		grow(out, size);
 	    }

diff --git a/ext/oj/parse.c b/ext/oj/parse.c
@@ -441,7 +441,7 @@ read_num(ParseInfo pi) {
 		}
 		// TBD move size check here
 		ni.i = ni.i * 10 + d;
-		if (LONG_MAX <= ni.i || DEC_MAX < ni.dec_cnt - zero_cnt) {
+		if (LONG_MAX <= ni.i || DEC_MAX < ni.dec_cnt) {
 		    ni.big = 1;
 		}
 	    }

diff --git a/test/test_various.rb b/test/test_various.rb
@@ -899,8 +899,10 @@ def test_bignum_compat
     b = Oj.load(json, :mode => :strict)
     assert_equal(30226801971775055948247051683954096612865741943, b)
   end
+
   def test_bignum_object
     dump_and_load(7 ** 55, false)
+    dump_and_load(10 ** 19, false)
   end
 
   # BigDecimal