oj 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6eb31374aec1871cad89ee54750d2223cbd817
-  data.tar.gz: 418dcce615bc52dac68170d152c8934be5d2a68d
+  metadata.gz: 362c05976208620196631aa5d6cd69759c2eec9f
+  data.tar.gz: 95cd1d6833702d958b5b8eecfd5e3480e75e8736
 SHA512:
-  metadata.gz: d566a85337ca2ee4df8500eb75a23c20c93ce26e74f7f57f48215f81faaf4396dce0a58ba0d40391ee32364fab2f1b171ede4c2f879f87c242bad53fd7af8242
-  data.tar.gz: cea71e839082f2aba82511a2a9886115496b8da839616d2f0020c5bc25eb9603825ed667a4ec6832825539a3482590a827b1a5115e226cc17f5639f8d66cae35
+  metadata.gz: 672874c0393c2e718c8cef9ddf2a479f730df35c08a39fa36da00c3a4bc8b7fa3d45ff5db41379525212c04d70ec2e805666ee55c1c6d5a06c81e3fbe682db63
+  data.tar.gz: 84c9d719920d5fe073a4980b43861d0315f84d8910d820598a3835e47fa6a1a7fc7074fb3d5049073c32bddefade970167990debdc7fd61f0faed3c97a9dc52f

data/README.md

@@ -20,6 +20,10 @@ 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.1
+
+ - Fixed off by 1 error in buffer for escaped strings.
+
 ### Current Release 2.1.0
 
  - This version is a major rewrite of the parser. The parser now uses a constant

data/ext/oj/buf.h

@@ -34,16 +34,16 @@
 #include "ruby.h"
 
 typedef struct _Buf {
-    char	base[1024];
     char	*head;
     char	*end;
     char	*tail;
+    char	base[1024];
 } *Buf;
 
 inline static void
 buf_init(Buf buf) {
     buf->head = buf->base;
-    buf->end = buf->base + sizeof(buf->base);
+    buf->end = buf->base + sizeof(buf->base) - 1;
     buf->tail = buf->head;
 }
 
@@ -73,7 +73,7 @@ buf_append_string(Buf buf, const char *s, size_t slen) {
 	    REALLOC_N(buf->head, char, new_len);
 	}
 	buf->tail = buf->head + toff;
-	buf->end = buf->head + new_len;
+	buf->end = buf->head + new_len - 1;
     }
     memcpy(buf->tail, s, slen);
     buf->tail += slen;
@@ -93,7 +93,7 @@ buf_append(Buf buf, char c) {
 	    REALLOC_N(buf->head, char, new_len);
 	}
 	buf->tail = buf->head + toff;
-	buf->end = buf->head + new_len;
+	buf->end = buf->head + new_len - 1;
     }
     *buf->tail = c;
     buf->tail++;

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -12,6 +12,4 @@ $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'oj'
 
-n = 17572
-Oj.strict_load('[' * n + ']' * n)
-
+Oj.load_file('josh2.json', :mode => :strict)

data/test/test_strict.rb

@@ -88,6 +88,14 @@ class StrictJuice < ::Test::Unit::TestCase
     assert_equal(json, json2)
   end
 
+  def test_unicode_long
+    # tests buffer overflow
+    json = %{"\\u019f\\u05e9\\u3074\\ud834\\udd1e #{'x' * 2000}"}
+    obj = Oj.load(json)
+    json2 = Oj.dump(obj, :ascii_only => true)
+    assert_equal(json, json2)
+  end
+
   def test_array
     dump_and_load([], false)
     dump_and_load([true, false], false)
@@ -239,6 +247,7 @@ class StrictJuice < ::Test::Unit::TestCase
     assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
   end
 
+
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, :indent => 2)
     puts json if trace

metadata

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