oj 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a9a1e933a2b0c03c3fb9c0e0b8ef0447edf2438
-  data.tar.gz: 588b81842eb490fd7beb6021a048f7703ddeb28a
+  metadata.gz: a944529c2d9fc9f12e3be88cb7edd568e3c32de9
+  data.tar.gz: d40180c12d6ae9ee8e50fa13bbe49374674e5eb3
 SHA512:
-  metadata.gz: e74ce695c617c00f6124a523294f949eb291b6c80f8da2c1e122d088b0c381473142bb3650ddd634693458c2356f37185ecebb03adf4c682e5337cbccf1b10de
-  data.tar.gz: e8eb16851a194c06a5a41527c63c149001bee902132e4591fbf3f46544b17ec942924ca5e5f7abf7bda5cc4fcf24623c1dd03c12afc9525561f52231b68486e8
+  metadata.gz: a46eb91148fd3200c0226d38a7ad9bff977a037a0ebd93ddcda9b082f515e2561e815c01694c58ec17af7d9be9f83075a4f630c35b077c862b1de048173f1627
+  data.tar.gz: af1bfff262e48d2f46282b5314247a98ea919fbb17f8b653fca03736f93944f61e1fba25b00df894020372ae0f3b1e3bddd2732c3be65dfe2c17bec6140d77e2

data/ext/oj/dump.c

@@ -157,11 +157,15 @@ inline static size_t
 hixss_friendly_size(const uint8_t *str, size_t len) {
     size_t	size = 0;
     size_t	i = len;
-
+    bool	check = false;
+    
     for (; 0 < i; str++, i--) {
 	size += hixss_friendly_chars[*str];
+	if (0 != (0x80 & *str)) {
+	    check = true;
+	}
     }
-    return size - len * (size_t)'0';
+    return size - len * (size_t)'0' + check;
 }
 
 inline static size_t
@@ -279,6 +283,34 @@ dump_unicode(const char *str, const char *end, Out out) {
     return str - 1;
 }
 
+static const char*
+check_unicode(const char *str, const char *end) {
+    uint8_t	b = *(uint8_t*)str;
+    int		cnt;
+    
+    if (0xC0 == (0xE0 & b)) {
+	cnt = 1;
+    } else if (0xE0 == (0xF0 & b)) {
+	cnt = 2;
+    } else if (0xF0 == (0xF8 & b)) {
+	cnt = 3;
+    } else if (0xF8 == (0xFC & b)) {
+	cnt = 4;
+    } else if (0xFC == (0xFE & b)) {
+	cnt = 5;
+    } else {
+	rb_raise(oj_json_generator_error_class, "Invalid Unicode");
+    }
+    str++;
+    for (; 0 < cnt; cnt--, str++) {
+	b = *(uint8_t*)str;
+	if (end <= str || 0x80 != (0xC0 & b)) {
+	    rb_raise(oj_json_generator_error_class, "Invalid Unicode");
+	}
+    }
+    return str;
+}
+
 // Returns 0 if not using circular references, -1 if no further writing is
 // needed (duplicate), and a positive value if the object was added to the
 // cache.
@@ -707,6 +739,7 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 	*out->cur++ = '"';
     } else {
 	const char	*end = str + cnt;
+	const char	*check_start = str;
 
 	if (is_sym) {
 	    *out->cur++ = ':';
@@ -714,6 +747,15 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 	for (; str < end; str++) {
 	    switch (cmap[(uint8_t)*str]) {
 	    case '1':
+		if (JXEsc == out->opts->escape_mode && check_start <= str) {
+		    if (0 != (0x80 & (uint8_t)*str)) {
+			if (0xC0 == (0xC0 & (uint8_t)*str)) {
+			    check_start = check_unicode(str, end);
+			} else {
+			    rb_raise(oj_json_generator_error_class, "Invalid Unicode");
+			}
+		    }
+		}
 		*out->cur++ = *str;
 		break;
 	    case '2':
@@ -734,6 +776,7 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 			str = dump_unicode(str, end, out);
 		    } else {
 			*out->cur++ = *str;
+			check_start = str + 3;
 		    }
 		    break;
 		}
@@ -773,7 +816,7 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 		    break;
 		case 2:
 		    if (0xE0 != (0xF0 & c)) {
-			rb_raise(oj_json_generator_error_class, "Partial character in string. 2");
+			rb_raise(oj_json_generator_error_class, "Partial character in string.");
 		    }
 		    break;
 		case 3:

data/ext/oj/dump_compat.c

@@ -5,6 +5,7 @@
 
 #include "code.h"
 #include "dump.h"
+#include "rails.h"
 
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
 #define OJ_INFINITY (1.0/0.0)
@@ -612,9 +613,13 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
     } else if (d == (double)(long long int)d) {
 	//cnt = snprintf(buf, sizeof(buf), "%.1Lf", (long double)d);
 	cnt = snprintf(buf, sizeof(buf), "%.1f", d);
-    } else {
-	//cnt = snprintf(buf, sizeof(buf), "%0.16Lg", (long double)d);
+    } else if (oj_rails_float_opt) {
 	cnt = snprintf(buf, sizeof(buf), "%0.16g", d);
+    } else {
+	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	strcpy(buf, rb_string_value_ptr((VALUE*)&rstr));
+	cnt = RSTRING_LEN(rstr);
     }
     assure_size(out, cnt);
     for (b = buf; '\0' != *b; b++) {

data/ext/oj/mimic_json.c

@@ -669,7 +669,7 @@ static struct _Options	mimic_object_to_json_options = {
     10,		// create_id_len
     3,		// sec_prec
     16,		// float_prec
-    "%0.15g",	// float_fmt
+    "%0.16g",	// float_fmt
     Qnil,	// hash_class
     Qnil,	// array_class
     {		// dump_opts

data/ext/oj/oj.c

@@ -1000,6 +1000,7 @@ to_json(int argc, VALUE *argv, VALUE self) {
     if (1 > argc) {
 	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1).");
     }
+    copts.escape_mode = JXEsc;
     copts.dump_opts.nan_dump = false;
     if (2 == argc) {
 	oj_parse_mimic_dump_options(argv[1], &copts);
@@ -1600,4 +1601,3 @@ Init_oj() {
 #endif
     oj_init_doc();
 }
-

data/ext/oj/rails.c

@@ -19,6 +19,7 @@ typedef struct _Encoder {
 
 bool	oj_rails_hash_opt = false;
 bool	oj_rails_array_opt = false;
+bool	oj_rails_float_opt = false;
 
 static void	dump_rails_val(VALUE obj, int depth, Out out, bool as_ok);
 
@@ -187,7 +188,6 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
     *out->cur = '\0';
 }
 
-
 static ID	to_a_id = 0;
 
 static void
@@ -484,11 +484,12 @@ optimize(int argc, VALUE *argv, ROptTable rot, bool on) {
 	    oj_rails_hash_opt = on;
 	} else if (rb_cArray == *argv) {
 	    oj_rails_array_opt = on;
+	} else if (rb_cFloat == *argv) {
+	    oj_rails_float_opt = on;
 	} else if (NULL != (ro = oj_rails_get_opt(rot, *argv)) ||
 		   NULL != (ro = create_opt(rot, *argv))) {
 	    ro->on = on;
 	}
-	// TBD recurse if there are subclasses
     }
 }
 
@@ -936,8 +937,13 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	    cnt = 4;
 	} else if (d == (double)(long long int)d) {
 	    cnt = snprintf(buf, sizeof(buf), "%.1f", d);
-	} else {
+	} else if (oj_rails_float_opt) {
 	    cnt = snprintf(buf, sizeof(buf), "%0.16g", d);
+	} else {
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	    strcpy(buf, rb_string_value_ptr((VALUE*)&rstr));
+	    cnt = RSTRING_LEN(rstr);
 	}
     }
     assure_size(out, cnt);
@@ -1091,8 +1097,7 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 	    return;
 	}
     }
-    //if (!oj_rails_hash_opt && 0 < out->argc && as_ok && rb_respond_to(obj, oj_as_json_id)) {
-    if (0 < out->argc && as_ok && rb_respond_to(obj, oj_as_json_id)) {
+    if ((!oj_rails_hash_opt || 0 < out->argc) && as_ok && rb_respond_to(obj, oj_as_json_id)) {
 	dump_as_json(obj, depth, out, false);
 	return;
     }

data/ext/oj/rails.h

@@ -13,6 +13,7 @@ extern ROpt	oj_rails_get_opt(ROptTable rot, VALUE clas);
 
 extern bool	oj_rails_hash_opt;
 extern bool	oj_rails_array_opt;
+extern bool	oj_rails_float_opt;
 
 extern VALUE	oj_optimize_rails(VALUE self);
 

data/lib/oj/version.rb

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

data/pages/Rails.md

@@ -61,6 +61,7 @@ Oj::Rails.optimize is called with no arguments are:
 
  * Array
  * BigDecimal
+ * Float
  * Hash
  * Range
  * Regexp
@@ -72,3 +73,16 @@ Oj::Rails.optimize is called with no arguments are:
 
 The ActiveSupport decoder is the JSON.parse() method. Calling the
 Oj::Rails.set_decoder() method replaces that method with the Oj equivelant.
+
+### Notes:
+
+1. Optimized Floats set the significant digits to 16. This is different than
+   Ruby which is used by the json gem and by Rails. Ruby varies the
+   significant digits which can be either 16 or 17 depending on the value.
+
+2. Optimized Hashs do not collapse keys that become the same in the output. As
+   an example, a non-String object that has a to_s() method will become the
+   return value of the to_s() method in the output without checking to see if
+   that has already been used. This could occur is a mix of String and Symbols
+   are used as keys or if a other non-String objects such as Numerics are mixed
+   with numbers as Strings.

data/test/test_compat.rb

@@ -283,7 +283,6 @@ class CompatJuice < Minitest::Test
     end
     x = Oj.load('Infinity', :mode => :compat)
     assert_equal('Infinity', x.to_s)
-
   end
 
   # Time
@@ -461,6 +460,24 @@ class CompatJuice < Minitest::Test
     assert_equal(%|{"args":"[{:max_nesting=>40}]"}|, json)
   end
 
+  def test_bad_unicode
+    begin
+      Oj.to_json("\xE4xy")
+      fail()
+    rescue Exception
+      assert(true)
+    end
+  end
+
+  def test_bad_unicode_start
+    begin
+      Oj.to_json("\x8abc")
+      fail()
+    rescue Exception
+      assert(true)
+    end
+  end
+
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj)
     puts json if trace

metadata

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