oj 3.3.8 → 3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28fc69ea25c02c80fd4d5d1622f05350e0fd6d5e
-  data.tar.gz: 143ef4198b371f30dbdd12d8e4f1ecd4b43cdb08
+  metadata.gz: 4f086bef3216ed10da36f2302af180253dfdd2db
+  data.tar.gz: e1dfb9a7d1ec308b19ec532adb2dc320fcf6bf8b
 SHA512:
-  metadata.gz: b0478c6f09d46f53827b981ed947002c8b723884c83276384b1316f2d85db9dd29dba0095d4d6a8d618062c313954d5883e05b08e8ba016bb949aae43b797dad
-  data.tar.gz: 826fdefe54a411b7b92cc5563caeacccced2a7c0a25f869e1995fca3309cef7e4692e0ddb6e219317e788cc40daf3ddd4c0eb1c45bc932b4ab0e44a7c9d44bae
+  metadata.gz: d3c5a71807363fcd682474d42760199bc8f4709505648c63aebbc9dadbc91677ae27f82c4712973d5fe01935998dcff46c611c92a920b39016d217a6c3cfd3a7
+  data.tar.gz: fb39fbaae9c45f79ff49f30ab624838d3c7b2061d7aa6d891dc2c05e8f7cffd2dcd48bf08618264a12f6ad0092206de7a12b9c11773dae8f7fc0c38c8c27c22f

data/README.md

@@ -1,6 +1,6 @@
 # [![{}j](http://www.ohler.com/dev/images/oj_comet_64.svg)](http://www.ohler.com/oj) gem
 
-[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg)](http://travis-ci.org/ohler55/oj?branch=master) [![AppVeyor](https://img.shields.io/appveyor/ci/ohler55/oj/master.svg)](https://ci.appveyor.com/project/ohler55/oj) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg)
+[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg)](http://travis-ci.org/ohler55/oj?branch=master) [![AppVeyor](https://img.shields.io/appveyor/ci/ohler55/oj/master.svg)](https://ci.appveyor.com/project/ohler55/oj) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg) [![Gratipay](https://img.shields.io/gratipay/project/oj.svg)](https://gratipay.com/oj/)
 
 A *fast* JSON parser and Object marshaller as a Ruby gem.
 

data/ext/oj/dump.c

@@ -685,6 +685,23 @@ oj_dump_sym(VALUE obj, int depth, Out out, bool as_ok) {
     oj_dump_cstr(sym, strlen(sym), 0, 0, out);
 }
 
+static void
+debug_raise(const char *orig, size_t cnt, int line) {
+    char	buf[1024];
+    char	*b = buf;
+    const char	*s = orig;
+    const char	*s_end = s + cnt;
+
+    if (32 < s_end - s) {
+	s_end = s + 32;
+    }
+    for (; s < s_end; s++) {
+	b += sprintf(b, " %02x", *s);
+    }
+    *b = '\0';
+    rb_raise(oj_json_generator_error_class, "Partial character in string. %s @ %d", buf, line);
+}
+
 void
 oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
     size_t	size;
@@ -810,41 +827,34 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 	}
 	*out->cur++ = '"'; 
     }
-    if (JXEsc == out->opts->escape_mode && 0 != (0x80 & *(str - 1))) {
+    if (JXEsc == out->opts->escape_mode && 0 < str - orig && 0 != (0x80 & *(str - 1))) {
 	uint8_t	c = (uint8_t)*(str - 1);
 	int	i;
+	int	scnt = str - orig;
 	
 	// Last utf-8 characters must be 0x10xxxxxx. The start must be
 	// 0x110xxxxx for 2 characters, 0x1110xxxx for 3, and 0x11110xxx for
 	// 4.
 	if (0 != (0x40 & c)) {
-	    char	buf[1024];
-	    char	*b = buf;
-	    const char	*s = orig;
-
-	    for (; s < s + cnt; s++) {
-		b += sprintf(b, " %02x", *s);
-	    }
-	    *b = '\0';
-	    rb_raise(oj_json_generator_error_class, "Partial character in string. %s", buf);
+	    debug_raise(orig, cnt, __LINE__);
 	}
-	for (i = 1; i < (int)cnt && i < 4; i++) {
+	for (i = 1; i < (int)scnt && i < 4; i++) {
 	    c = str[-1 - i];
 	    if (0x80 != (0xC0 & c)) {
 		switch (i) {
 		case 1:
 		    if (0xC0 != (0xE0 & c)) {
-			rb_raise(oj_json_generator_error_class, "Partial character in string.");
+			debug_raise(orig, cnt, __LINE__);
 		    }
 		    break;
 		case 2:
 		    if (0xE0 != (0xF0 & c)) {
-			rb_raise(oj_json_generator_error_class, "Partial character in string.");
+			debug_raise(orig, cnt, __LINE__);
 		    }
 		    break;
 		case 3:
 		    if (0xF0 != (0xF8 & c)) {
-			rb_raise(oj_json_generator_error_class, "Partial character in string.");
+			debug_raise(orig, cnt, __LINE__);
 		    }
 		    break;
 		default: // can't get here
@@ -853,8 +863,8 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 		break;
 	    }
 	}
-	if (i == (int)cnt || 4 <= i) {
-	    rb_raise(oj_json_generator_error_class, "Partial character in string.");
+	if (i == (int)scnt || 4 <= i) {
+	    debug_raise(orig, cnt, __LINE__);
 	}
     }
     *out->cur = '\0';

data/lib/oj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.3.9
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler