oj 2.1.7 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70957d2247e339a9ad73f19ad36df9da6979848b
-  data.tar.gz: b2bdcf86cf0920e464560066b7054c997656b53c
+  metadata.gz: 2acd85015af30a88c50ae38253f4595c701a6e6e
+  data.tar.gz: 226adba1e99b118b6c3fd6e3a1d4663a9168c94c
 SHA512:
-  metadata.gz: d4ec5a8db9aa7fd4d9c3721ccbd09f7aa357583d4a8c75f071ee007356b9371164ab75dd2ea897117cb332cf9d6158f47e0c8338aacb3b77c389e0ca08c099a6
-  data.tar.gz: 5849f4c725ee2db364c41a034aead4e1c547ae53bb090db10e6bbb65013a19812cd024586fcba1f0d58285ded793a5f5c4675103f095cd57f184ba36beca6fe8
+  metadata.gz: d13abbe27c0f818011a68e456d88cedb0b648641f543aa09eab20f9a43fdfd368899b51d99c732eb23ab1b405285a0f68203bd85e705f1fbbbf5d3e2c03e9bac
+  data.tar.gz: 526a83f70809d99e54ce21c0f1905cf0a19ceb35216aad41aa4138071af8e611f2c744ce8b4fbb22f20113b46db90d8bca57ded64a10da0729112c6812fadb22

data/README.md

@@ -20,13 +20,15 @@ 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.1.7
+### Current Release 2.2.0
 
- - Added support for NaN and -NaN to address issue #102. This is not according to the JSON spec but seems to be expected.
+ - All 1.8.x versions of Ruby now have require 'rational' called.
 
- - Added require for rational if the Ruby version is 1.8.7 to address issue #104.
+ - Removed the temporary GC disable and implemented mark strategy instead.
 
- - Added Rails re-call of Oj.dump in the to_json() method which caused loops with Rational objects to fix issue #108 and #105.
+ - Added new character encoding mode to support the Rails 4 escape characters of &, <, and > as xss_safe mode. The :encoding option replaces the :ascii_only option.
+
+ - Change parsing of NaN to not use math.h which on older systems does not define NAN.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -96,6 +96,7 @@ static void	dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out);
 
 static void	grow(Out out, size_t len);
 static size_t	hibit_friendly_size(const uint8_t *str, size_t len);
+static size_t	xss_friendly_size(const uint8_t *str, size_t len);
 static size_t	ascii_friendly_size(const uint8_t *str, size_t len);
 
 static void	dump_leaf(Leaf leaf, int depth, Out out);
@@ -134,6 +135,16 @@ static char	ascii_friendly_chars[256] = "\
 33333333333333333333333333333333\
 33333333333333333333333333333333";
 
+static char	xss_friendly_chars[256] = "\
+66666666222622666666666666666666\
+11211161111111121111111111116161\
+11111111111111111111111111112111\
+11111111111111111111111111111116\
+33333333333333333333333333333333\
+33333333333333333333333333333333\
+33333333333333333333333333333333\
+33333333333333333333333333333333";
+
 inline static size_t
 hibit_friendly_size(const uint8_t *str, size_t len) {
     size_t	size = 0;
@@ -154,6 +165,16 @@ ascii_friendly_size(const uint8_t *str, size_t len) {
     return size - len * (size_t)'0';
 }
 
+inline static size_t
+xss_friendly_size(const uint8_t *str, size_t len) {
+    size_t	size = 0;
+
+    for (; 0 < len; str++, len--) {
+	size += xss_friendly_chars[*str];
+    }
+    return size - len * (size_t)'0';
+}
+
 inline static void
 fill_indent(Out out, int cnt) {
     if (0 < out->indent) {
@@ -401,13 +422,13 @@ dump_fixnum(VALUE obj, Out out) {
 
 static void
 dump_bignum(VALUE obj, Out out) {
-    VALUE	rs = rb_big2str(obj, 10);
-    int		cnt = (int)RSTRING_LEN(rs);
+    volatile VALUE	rs = rb_big2str(obj, 10);
+    int			cnt = (int)RSTRING_LEN(rs);
 
     if (out->end - out->cur <= (long)cnt) {
 	grow(out, cnt);
     }
-    memcpy(out->cur, StringValuePtr(rs), cnt);
+    memcpy(out->cur, rb_string_value_cstr((VALUE*)&rs), cnt);
     out->cur += cnt;
     *out->cur = '\0';
 }
@@ -455,10 +476,17 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
     size_t	size;
     char	*cmap;
 
-    if (Yes == out->opts->ascii_only) {
+    switch (out->opts->escape_mode) {
+    case ASCIIEsc:
 	cmap = ascii_friendly_chars;
 	size = ascii_friendly_size((uint8_t*)str, cnt);
-    } else {
+	break;
+    case XSSEsc:
+	cmap = xss_friendly_chars;
+	size = xss_friendly_size((uint8_t*)str, cnt);
+	break;
+    case JSONEsc:
+    default:
 	cmap = hibit_friendly_chars;
 	size = hibit_friendly_size((uint8_t*)str, cnt);
     }
@@ -528,12 +556,12 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 
 static void
 dump_str_comp(VALUE obj, Out out) {
-    dump_cstr(StringValuePtr(obj), RSTRING_LEN(obj), 0, 0, out);
+    dump_cstr(rb_string_value_cstr((VALUE*)&obj), RSTRING_LEN(obj), 0, 0, out);
 }
 
 static void
 dump_str_obj(VALUE obj, Out out) {
-    const char	*s = StringValuePtr(obj);
+    const char	*s = rb_string_value_cstr((VALUE*)&obj);
     size_t	len = RSTRING_LEN(obj);
     char	s1 = s[1];
 
@@ -583,20 +611,14 @@ dump_class_obj(VALUE obj, Out out) {
 
 static void
 dump_array(VALUE a, int depth, Out out) {
-    VALUE	*np;
     size_t	size;
-    int		cnt;
+    int		i, cnt;
     int		d2 = depth + 1;
     long	id = check_circular(a, out);
 
     if (id < 0) {
 	return;
     }
-
-#if HAS_GC_GUARD
-    RB_GC_GUARD(a);
-#endif
-    np = RARRAY_PTR(a);
     cnt = (int)RARRAY_LEN(a);
     *out->cur++ = '[';
     if (0 < id) {
@@ -626,7 +648,8 @@ dump_array(VALUE a, int depth, Out out) {
 	} else {
 	    size = d2 * out->opts->dump_opts->indent_size + out->opts->dump_opts->array_size + 1;
 	}
-	for (; 0 < cnt; cnt--, np++) {
+	cnt--;
+	for (i = 0; i <= cnt; i++) {
 	    if (out->end - out->cur <= (long)size) {
 		grow(out, size);
 	    }
@@ -645,8 +668,8 @@ dump_array(VALUE a, int depth, Out out) {
 		    }
 		}
 	    }
-	    dump_val(*np, d2, out);
-	    if (1 < cnt) {
+	    dump_val(rb_ary_entry(a, i), d2, out);
+	    if (i < cnt) {
 		*out->cur++ = ',';
 	    }
 	}
@@ -1000,9 +1023,9 @@ dump_time(VALUE obj, Out out) {
 
 static void
 dump_ruby_time(VALUE obj, Out out) {
-    VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-    dump_cstr(StringValuePtr(rstr), RSTRING_LEN(rstr), 0, 0, out);
+    dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 }
 
 static void
@@ -1098,9 +1121,9 @@ dump_data_strict(VALUE obj, Out out) {
     VALUE	clas = rb_obj_class(obj);
 
     if (oj_bigdecimal_class == clas) {
-	VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-	dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+	dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
     } else {
 	raise_strict(obj);
     }
@@ -1111,9 +1134,9 @@ dump_data_null(VALUE obj, Out out) {
     VALUE	clas = rb_obj_class(obj);
 
     if (oj_bigdecimal_class == clas) {
-	VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-	dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+	dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
     } else {
 	dump_nil(out);
     }
@@ -1121,10 +1144,10 @@ dump_data_null(VALUE obj, Out out) {
 
 static void
 dump_data_comp(VALUE obj, int depth, Out out) {
-    VALUE	o2;
+    volatile VALUE	o2;
 
     if (rb_respond_to(obj, oj_to_hash_id)) {
-	VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
+	volatile VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
  
 	if (T_HASH != rb_type(h)) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
@@ -1133,14 +1156,14 @@ dump_data_comp(VALUE obj, int depth, Out out) {
     } else if (rb_respond_to(obj, oj_as_json_id) && obj != (o2 = rb_funcall(obj, oj_as_json_id, 0))) {
 	dump_val(o2, depth, out);
     } else if (rb_respond_to(obj, oj_to_json_id) && (!oj_rails_hack || last_obj != obj)) {
-	VALUE		rs;
+	volatile VALUE	rs;
 	const char	*s;
 	int		len;
 
 	last_obj = obj;
 	rs = rb_funcall(obj, oj_to_json_id, 0);
 	last_obj = Qundef;
-	s = StringValuePtr(rs);
+	s = rb_string_value_cstr((VALUE*)&rs);
 	len = (int)RSTRING_LEN(rs);
 
 	if (out->end - out->cur <= len + 1) {
@@ -1160,18 +1183,17 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 	    default:		dump_time(obj, out);		break;
 	    }
 	} else if (oj_bigdecimal_class == clas) {
-	    VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	    if (Yes == out->opts->bigdec_as_num) {
-		dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+		dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 	    } else {
-		dump_cstr(StringValuePtr(rstr), RSTRING_LEN(rstr), 0, 0, out);
+		dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	    }
 	} else {
-	    VALUE	rstr;
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-	    rstr = rb_funcall(obj, oj_to_s_id, 0);
-	    dump_cstr(StringValuePtr(rstr), RSTRING_LEN(rstr), 0, 0, out);
+	    dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	}
     }
 }
@@ -1198,12 +1220,12 @@ dump_data_obj(VALUE obj, int depth, Out out) {
 
 	if (0 == odd) {
 	    if (oj_bigdecimal_class == clas) {
-		VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+		volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 		
 		if (Yes == out->opts->bigdec_as_num) {
-		    dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+		    dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 		} else {
-		    dump_cstr(StringValuePtr(rstr), RSTRING_LEN(rstr), 0, 0, out);
+		    dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 		}
 	    } else {
 		dump_nil(out);
@@ -1216,27 +1238,26 @@ dump_data_obj(VALUE obj, int depth, Out out) {
 
 static void
 dump_obj_comp(VALUE obj, int depth, Out out) {
-#if HAS_GC_GUARD
-    RB_GC_GUARD(obj);
-#endif
     if (rb_respond_to(obj, oj_to_hash_id)) {
-	VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
+	volatile VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
  
 	if (T_HASH != rb_type(h)) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
 	dump_hash(h, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_as_json_id)) {
-	dump_val(rb_funcall(obj, oj_as_json_id, 0), depth, out);
+	volatile VALUE	js = rb_funcall(obj, oj_as_json_id, 0);
+
+	dump_val(js, depth, out);
     } else if (rb_respond_to(obj, oj_to_json_id) && (!oj_rails_hack || last_obj != obj)) {
-	VALUE		rs;
+	volatile VALUE	rs;
 	const char	*s;
 	int		len;
 
 	last_obj = obj;
 	rs = rb_funcall(obj, oj_to_json_id, 0);
 	last_obj = Qundef;
-	s = StringValuePtr(rs);
+	s = rb_string_value_cstr((VALUE*)&rs);
 	len = (int)RSTRING_LEN(rs);
 
 	if (out->end - out->cur <= len + 1) {
@@ -1249,17 +1270,17 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	VALUE	clas = rb_obj_class(obj);
 
 	if (oj_bigdecimal_class == clas) {
-	    VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	    if (Yes == out->opts->bigdec_as_num) {
-		dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+		dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 	    } else {
-		dump_cstr(StringValuePtr(rstr), RSTRING_LEN(rstr), 0, 0, out);
+		dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	    }
 	} else if (oj_datetime_class == clas || oj_date_class == clas) {
-	    VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-	    dump_cstr(StringValuePtr(rstr), RSTRING_LEN(rstr), 0, 0, out);
+	    dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	} else {
 	    Odd	odd = oj_get_odd(clas);
 
@@ -1283,9 +1304,9 @@ dump_obj_obj(VALUE obj, int depth, Out out) {
 
 	if (0 == odd) {
 	    if (oj_bigdecimal_class == clas) {
-		VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+		volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-		dump_raw(StringValuePtr(rstr), RSTRING_LEN(rstr), out);
+		dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 	    } else {
 		dump_obj_attrs(obj, clas, id, depth, out);
 	    }
@@ -1375,7 +1396,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 #if HAS_IVAR_HELPERS
 	cnt = (int)rb_ivar_count(obj);
 #else
-	VALUE		vars = rb_funcall2(obj, oj_instance_variables_id, 0, 0);
+	volatile VALUE	vars = rb_funcall2(obj, oj_instance_variables_id, 0, 0);
 	VALUE		*np = RARRAY_PTR(vars);
 	ID		vid;
 	const char	*attr;
@@ -1424,6 +1445,8 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 #endif
 #if HAS_EXCEPTION_MAGIC
 	if (Qtrue == rb_obj_is_kind_of(obj, rb_eException)) {
+	    volatile VALUE	rv;
+
 	    if (',' != *(out->cur - 1)) {
 		*out->cur++ = ',';
 	    }
@@ -1434,7 +1457,8 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    fill_indent(out, d2);
 	    dump_cstr("~mesg", 5, 0, 0, out);
 	    *out->cur++ = ':';
-	    dump_val(rb_funcall2(obj, rb_intern("message"), 0, 0), d2, out);
+	    rv = rb_funcall2(obj, rb_intern("message"), 0, 0);
+	    dump_val(rv, d2, out);
 	    if (out->end - out->cur <= 2) {
 		grow(out, 2);
 	    }
@@ -1446,7 +1470,8 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    fill_indent(out, d2);
 	    dump_cstr("~bt", 3, 0, 0, out);
 	    *out->cur++ = ':';
-	    dump_val(rb_funcall2(obj, rb_intern("backtrace"), 0, 0), d2, out);
+	    rv = rb_funcall2(obj, rb_intern("backtrace"), 0, 0);
+	    dump_val(rv, d2, out);
 	    if (out->end - out->cur <= 2) {
 		grow(out, 2);
 	    }
@@ -1463,17 +1488,19 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 static void
 dump_struct_comp(VALUE obj, int depth, Out out) {
     if (rb_respond_to(obj, oj_to_hash_id)) {
-	VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
+	volatile VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
  
 	if (T_HASH != rb_type(h)) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
 	dump_hash(h, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_to_json_id)) {
-	VALUE		rs = rb_funcall(obj, oj_to_json_id, 0);
-	const char	*s = StringValuePtr(rs);
-	int		len = (int)RSTRING_LEN(rs);
+	volatile VALUE	rs = rb_funcall(obj, oj_to_json_id, 0);
+	const char	*s;
+	int		len;
 
+	s = rb_string_value_cstr((VALUE*)&rs);
+	len = (int)RSTRING_LEN(rs);
 	if (out->end - out->cur <= len) {
 	    grow(out, len);
 	}
@@ -1530,11 +1557,11 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
 
 static void
 dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
-    ID		*idp;
-    VALUE	v;
-    const char	*name;
-    size_t	size;
-    int		d2 = depth + 1;
+    ID			*idp;
+    volatile VALUE	v;
+    const char		*name;
+    size_t		size;
+    int			d2 = depth + 1;
 
     if (out->end - out->cur <= 2) {
 	grow(out, 2);
@@ -1745,18 +1772,18 @@ oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
 #ifndef JRUBY_RUBY
 #if !IS_WINDOWS
     } else if (rb_respond_to(stream, oj_fileno_id) && Qnil != (s = rb_funcall(stream, oj_fileno_id, 0))) {
-	    int		fd = FIX2INT(s);
+	int	fd = FIX2INT(s);
 
-	    if (size != write(fd, out.buf, size)) {
-		if (out.allocated) {
-		    xfree(out.buf);
-		}
-		rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", errno, strerror(errno));
+	if (size != write(fd, out.buf, size)) {
+	    if (out.allocated) {
+		xfree(out.buf);
 	    }
+	    rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", errno, strerror(errno));
+	}
 #endif
 #endif
     } else if (rb_respond_to(stream, oj_write_id)) {
-	s = rb_funcall(stream, oj_write_id, 1, rb_str_new(out.buf, size));
+	rb_funcall(stream, oj_write_id, 1, rb_str_new(out.buf, size));
     } else {
 	if (out.allocated) {
 	    xfree(out.buf);
@@ -1787,7 +1814,7 @@ dump_leaf_str(Leaf leaf, Out out) {
 	dump_cstr(leaf->str, strlen(leaf->str), 0, 0, out);
 	break;
     case RUBY_VAL:
-	dump_cstr(StringValuePtr(leaf->value), RSTRING_LEN(leaf->value), 0, 0, out);
+	dump_cstr(rb_string_value_cstr(&leaf->value), RSTRING_LEN(leaf->value), 0, 0, out);
 	break;
     case COL_VAL:
     default:

data/ext/oj/extconf.rb

@@ -28,9 +28,8 @@ dflags = {
   'HAS_IVAR_HELPERS' => ('ruby' == type && !is_windows && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
   'HAS_EXCEPTION_MAGIC' => ('ruby' == type && ('1' == version[0] && '9' == version[1])) ? 0 : 1,
   'HAS_PROC_WITH_BLOCK' => ('ruby' == type && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
-  'HAS_GC_GUARD' => ('jruby' != type && 'rubinius' != type) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
-  'NEEDS_RATIONAL' => ('ruby' == type &&  '1' == version[0] && '8' == version[1]) ? 1 : 0,
+  'NEEDS_RATIONAL' => ('1' == version[0] && '8' == version[1]) ? 1 : 0,
   'IS_WINDOWS' => is_windows ? 1 : 0,
   'SAFE_CACHE' => is_windows ? 0 : 1,
 }