oj 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f8482eb646d2eea0781d023d94e10ea29e10936
-  data.tar.gz: 085d5a8ff9fe704c875021496a9a28cdd8c957f0
+  metadata.gz: 8a212c2204a5f29bb42b42ed9db56d51f44bda08
+  data.tar.gz: 6f151a8f68ff8720ebb3e1dac263b234d0cedb00
 SHA512:
-  metadata.gz: 04f67e449e524a7ac7a883ab20e305fe2bd75fed02f85c8a3ca3b16ee7c9ce17df7b23a1133f375d6088621210fca5f55eec01e8764a7a2d8a7cd37977d53f19
-  data.tar.gz: 88a657bdbe9063946d24e0de22447bee76bff728e660d86ccecf81853fe2044e333166e1013343fccb022ed977656d083234d916aed1ea9baa1254ff59c82142
+  metadata.gz: 94d89b9109d22a280a368caf064717a7f662e9056681c1ec8ac6aae6d9c775cf5ef3cad6619cd3610d5864f0ad3f3d785c2aebf862a5891a027ce2180e588fa5
+  data.tar.gz: bee25237960557655787c3082aaf56652bcf002d0da6b23445bd30549a895be177215a266e5133dad8946d5dea8b83662dede24570623c3cf193fb3d626fffd0

data/README.md

@@ -26,22 +26,9 @@ 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.10.1
+### Current Release 2.10.2
 
- - Changed parse argument error to be a Ruby ArgError instead of a general Exception.
-
-### Release 2.10.0
-
- - Using an indent of less than zero will not place newline characters between
-   JSON elements when using the string or stream writer.
-
- - new options callback method was added to the Simple Callback Parser. If
-   defined the prepare_key() method will be called when an JSON object ket is
-   first encountered. The return value is then used as the key in the key-value
-   pair.
-
- - Increased significants digits to 16 from 15. On occasion there may be
-   unexpected round off results. Tou avoid those use the bigdecimal options.
+ - Fixed string corruption bug due to an uncommented assignment used for debugging.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/compat.c

@@ -47,7 +47,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
     if (Qundef == rkey &&
 	0 != pi->options.create_id &&
 	*pi->options.create_id == *key &&
-	pi->options.create_id_len == klen &&
+	(int)pi->options.create_id_len == klen &&
 	0 == strncmp(pi->options.create_id, key, klen)) {
 	parent->classname = oj_strndup(str, len);
 	parent->clen = len;

data/ext/oj/object.c

@@ -285,7 +285,7 @@ set_obj_ivar(Val parent, Val kval, VALUE value) {
     if (0 == (var_id = oj_attr_hash_get(key, klen, &slot))) {
 	char	attr[256];
 
-	if (sizeof(attr) <= klen + 2) {
+	if ((int)sizeof(attr) <= klen + 2) {
 	    char	*buf = ALLOC_N(char, klen + 2);
 
 	    if ('~' == *key) {
@@ -354,7 +354,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
 	} else if (0 != oj_odd_set_arg(parent->odd_args, kval->key, kval->klen, str_to_value(pi, str, len, orig))) {
 	    char	buf[256];
 
-	    if (sizeof(buf) - 1 <= klen) {
+	    if ((int)sizeof(buf) - 1 <= klen) {
 		klen = sizeof(buf) - 2;
 	    }
 	    memcpy(buf, key, klen);
@@ -401,7 +401,7 @@ hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
 	} else if (0 != oj_odd_set_arg(parent->odd_args, key, klen, oj_num_as_value(ni))) {
 	    char	buf[256];
 
-	    if (sizeof(buf) - 1 <= klen) {
+	    if ((int)sizeof(buf) - 1 <= klen) {
 		klen = sizeof(buf) - 2;
 	    }
 	    memcpy(buf, key, klen);
@@ -470,7 +470,7 @@ hash_set_value(ParseInfo pi, Val kval, VALUE value) {
 	} else if (0 !=	oj_odd_set_arg(parent->odd_args, key, klen, value)) {
 	    char	buf[256];
 
-	    if (sizeof(buf) - 1 <= klen) {
+	    if ((int)sizeof(buf) - 1 <= klen) {
 		klen = sizeof(buf) - 2;
 	    }
 	    memcpy(buf, key, klen);

data/ext/oj/reader.c

@@ -51,7 +51,7 @@ static VALUE		partial_io_cb(VALUE rdr);
 static int		read_from_io(Reader reader);
 static int		read_from_fd(Reader reader);
 static int		read_from_io_partial(Reader reader);
-static int		read_from_str(Reader reader);
+//static int		read_from_str(Reader reader);
 
 void
 oj_reader_init(Reader reader, VALUE io, int fd) {
@@ -74,7 +74,7 @@ oj_reader_init(Reader reader, VALUE io, int fd) {
 	reader->read_func = read_from_fd;
 	reader->fd = fd;
     } else if (rb_cString == io_class) {
-	reader->read_func = read_from_str;
+	reader->read_func = 0;
 	reader->in_str = StringValuePtr(io);
 	reader->head = (char*)reader->in_str;
 	reader->tail = reader->head;
@@ -82,7 +82,7 @@ oj_reader_init(Reader reader, VALUE io, int fd) {
     } else if (oj_stringio_class == io_class) {
 	VALUE	s = rb_funcall2(io, oj_string_id, 0, 0);
 
-	reader->read_func = read_from_str;
+	reader->read_func = 0;
 	reader->in_str = StringValuePtr(s);
 	reader->head = (char*)reader->in_str;
 	reader->tail = reader->head;
@@ -121,12 +121,12 @@ oj_reader_read(Reader reader) {
 	    shift = reader->pro - reader->head - 1; // leave one character so we can backup one
 	}
 	if (0 >= shift) { /* no space left so allocate more */
-	    char	*old = reader->head;
+	    const char	*old = reader->head;
 	    size_t	size = reader->end - reader->head + BUF_PAD;
 	
 	    if (reader->head == reader->base) {
 		reader->head = ALLOC_N(char, size * 2);
-		memcpy(reader->head, old, size);
+		memcpy((char*)reader->head, old, size);
 	    } else {
 		REALLOC_N(reader->head, char, size * 2);
 	    }
@@ -141,7 +141,7 @@ oj_reader_read(Reader reader) {
 		reader->str = reader->head + (reader->str - old);
 	    }
 	} else {
-	    memmove(reader->head, reader->head + shift, reader->read_end - (reader->head + shift));
+	    memmove((char*)reader->head, reader->head + shift, reader->read_end - (reader->head + shift));
 	    reader->tail -= shift;
 	    reader->read_end -= shift;
 	    if (0 != reader->pro) {
@@ -153,7 +153,7 @@ oj_reader_read(Reader reader) {
 	}
     }
     err = reader->read_func(reader);
-    *reader->read_end = '\0';
+    *(char*)reader->read_end = '\0';
 
     return err;
 }
@@ -238,7 +238,9 @@ read_from_fd(Reader reader) {
 }
 
 // This is only called when the end of the string is reached so just return -1.
+/*
 static int
 read_from_str(Reader reader) {
     return -1;
 }
+*/

data/ext/oj/reader.h

@@ -149,7 +149,7 @@ reader_expect(Reader reader, const char *s) {
 static inline void
 reader_cleanup(Reader reader) {
     if (reader->free_head && 0 != reader->head) {
-	xfree(reader->head);
+	xfree((char*)reader->head);
 	reader->head = 0;
 	reader->free_head = 0;
     }

data/lib/oj/version.rb

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

data/test/mod.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+
+
+Thread.new do
+  string_io = StringIO.new('{"foo":"bar"}')
+  Oj.load(string_io)
+  string_io.rewind
+  puts string_io.read
+end.join

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -114,6 +114,7 @@ files:
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
+- test/mod.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb