oj 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9262e646eacc8cec4f6eceb06d4f5c84370d62a1
-  data.tar.gz: 1de9d17fe6bcfa76e5da8d61d239853f7948421c
+  metadata.gz: f86c65032eab3ae341bf09bede8c0fa8494a5443
+  data.tar.gz: c62cd79d31ffa2035698a47ed2096e17513beb4c
 SHA512:
-  metadata.gz: 95c811b68202c376bee344ad7c6aa10571cd4efec48a7b85f3e9057163643fc77e81c6780be85eaca0ad4f9eca1c1d2c66da6497e18235107bee6b133699eb09
-  data.tar.gz: 9c65680e52c0154dfeab3c712bbf29bd2f12f30bb720b084f7f4ddd5a6e75dad789fd4101a31d351a6613ff9258a545ff1aa8dcf2d77705244c29c0fdf5ec692
+  metadata.gz: c416b20f1d0972be265256950dcbf529802f92eda83b0f321f20a316a377a17cd3144267a70199f0640f975960bd8182e0bd31683baed77dcb1575fef67a88f8
+  data.tar.gz: 7c52c57286ed461fba95108bba72a31eec77ca6340e4f6fe4e622abe31fdfad68dbd0b3f1c05558f225547762e8d024143477935618d6a4d7e21db3f3de03729

data/README.md

@@ -21,9 +21,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.4.1
+### Current Release 2.4.2
 
- - Fixed Windows version by removing class cache test.
+ - Thanks to Patrik Rak for a fix to a buffer short copy when dumping with 0 indent.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -51,6 +51,9 @@
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
 #define OJ_INFINITY (1.0/0.0)
 
+// Extra padding at end of buffer.
+#define BUFFER_EXTRA 10
+
 typedef unsigned long	ulong;
 
 static void	raise_strict(VALUE obj);
@@ -228,11 +231,11 @@ grow(Out out, size_t len) {
 	size += len;
     }
     if (out->allocated) {
-	buf = REALLOC_N(out->buf, char, (size + 10));
+	buf = REALLOC_N(out->buf, char, (size + BUFFER_EXTRA));
     } else {
-	buf = ALLOC_N(char, (size + 10));
+	buf = ALLOC_N(char, (size + BUFFER_EXTRA));
 	out->allocated = 1;
-	memcpy(buf, out->buf, out->end - out->buf);
+	memcpy(buf, out->buf, out->end - out->buf + BUFFER_EXTRA);
     }
     if (0 == buf) {
 	rb_raise(rb_eNoMemError, "Failed to create string. [%d:%s]\n", ENOSPC, strerror(ENOSPC));
@@ -488,8 +491,8 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 	cmap = hibit_friendly_chars;
 	size = hibit_friendly_size((uint8_t*)str, cnt);
     }
-    if (out->end - out->cur <= (long)size + 10) { // extra 10 for escaped first char, quotes, and sym
-	grow(out, size + 10);
+    if (out->end - out->cur <= (long)size + BUFFER_EXTRA) { // extra 10 for escaped first char, quotes, and sym
+	grow(out, size + BUFFER_EXTRA);
     }
     *out->cur++ = '"';
     if (escape1) {
@@ -1717,7 +1720,7 @@ void
 oj_dump_obj_to_json(VALUE obj, Options copts, Out out) {
     if (0 == out->buf) {
 	out->buf = ALLOC_N(char, 4096);
-	out->end = out->buf + 4085; // 1 less than end plus extra for possible errors
+	out->end = out->buf + 4095 - BUFFER_EXTRA; // 1 less than end plus extra for possible errors
 	out->allocated = 1;
     }
     out->cur = out->buf;
@@ -1746,7 +1749,7 @@ oj_write_obj_to_file(VALUE obj, const char *path, Options copts) {
     int		ok;
 
     out.buf = buf;
-    out.end = buf + sizeof(buf) - 10;
+    out.end = buf + sizeof(buf) - BUFFER_EXTRA;
     out.allocated = 0;
     oj_dump_obj_to_json(obj, copts, &out);
     size = out.cur - out.buf;
@@ -1779,7 +1782,7 @@ oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
 #endif
 
     out.buf = buf;
-    out.end = buf + sizeof(buf) - 10;
+    out.end = buf + sizeof(buf) - BUFFER_EXTRA;
     out.allocated = 0;
     oj_dump_obj_to_json(obj, copts, &out);
     size = out.cur - out.buf;
@@ -1988,7 +1991,7 @@ void
 oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out) {
     if (0 == out->buf) {
 	out->buf = ALLOC_N(char, 4096);
-	out->end = out->buf + 4085; // 1 less than end plus extra for possible errors
+	out->end = out->buf + 4095 - BUFFER_EXTRA; // 1 less than end plus extra for possible errors
 	out->allocated = 1;
     }
     out->cur = out->buf;
@@ -2007,7 +2010,7 @@ oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
     FILE	*f;
 
     out.buf = buf;
-    out.end = buf + sizeof(buf) - 10;
+    out.end = buf + sizeof(buf) - BUFFER_EXTRA;
     out.allocated = 0;
     oj_dump_leaf_to_json(leaf, copts, &out);
     size = out.cur - out.buf;

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -12,4 +12,6 @@ $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'oj'
 
-Oj.load_file('josh2.json', :mode => :strict)
+obj = Oj.load_file('bug.json', :mode => :object)
+
+puts Oj.dump(obj, :mode => :object, :indent => 0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com