oj 1.2.12 → 1.2.13

data/README.md

@@ -32,6 +32,10 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
+### Release 1.2.13
+
+ - Fixed double free bug in Oj::Doc that showed up for larger documents.
+
 ### Release 1.2.12
 
  - Fixed GC bug in Oj::Doc, the fast parser.

data/ext/oj/fast.c

@@ -847,7 +847,7 @@ parse_json(VALUE clas, char *json, int given, int allocated) {
 	rb_gc_unregister_address(&doc->self);
 	DATA_PTR(doc->self) = 0;
 	doc_free(pi.doc);
-	if (allocated) {
+	if (allocated && 0 != ex) { // will jump so caller will not free
 	    xfree(json);
 	}
     } else {

data/lib/oj/version.rb

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

data/test/oj-test/test.rb

@@ -81,8 +81,6 @@ class Bid
   end
 end
 
-#GC.disable
-
 class BidResponseParser
   REQUIRED_ATTRIBUTES = [:id, :impid, :price].freeze
 
@@ -92,8 +90,8 @@ class BidResponseParser
   end
 
   def self.extract_fast(json)
-    doc = Oj::Doc.open(json)
-    #Oj::Doc.open(json) do |doc|
+    bid = nil
+    Oj::Doc.open(json) do |doc|
       bid = Bid.new
 
       # bid-response object
@@ -128,10 +126,9 @@ class BidResponseParser
       end
 
       bid.price = doc.fetch("#{bid_path}/price").to_f
+    end
 
-    doc.close # needed when not in Proc to cleanup
-      return bid
-    #end
+    return bid
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com