ox 1.2.6 → 1.2.7

data/ext/ox/dump.c

@@ -220,10 +220,10 @@ grow(Out out, size_t len) {
     char    *buf;
         
     size *= 2;
-    if (size < len + pos) {
+    if (size <= len * 2 + pos) {
         size += len;
     }
-    if (0 == (buf = (char*)realloc(out->buf, size))) {
+    if (0 == (buf = (char*)realloc(out->buf, size + 10))) { // 1 extra for terminator character plus extra (paranoid)
         rb_raise(rb_eNoMemError, "Failed to create string. [%d:%s]\n", ENOSPC, strerror(ENOSPC));
     }
     out->buf = buf;
@@ -244,7 +244,7 @@ dump_start(Out out, Element e) {
     if (0 < e->id) { // i="id"
         size += 24; // over estimate, 19 digits
     }
-    if (out->end - out->cur < (long)size) {
+    if (out->end - out->cur <= (long)size) {
         grow(out, size);
     }
     if (out->buf < out->cur) {
@@ -276,7 +276,7 @@ static void
 dump_end(Out out, Element e) {
     size_t      size = e->indent + 5;
 
-    if (out->end - out->cur < (long)size) {
+    if (out->end - out->cur <= (long)size) {
         grow(out, size);
     }
     fill_indent(out, e->indent);
@@ -289,7 +289,7 @@ dump_end(Out out, Element e) {
 
 inline static void
 dump_value(Out out, const char *value, size_t size) {
-    if (out->end - out->cur < (long)size) {
+    if (out->end - out->cur <= (long)size) {
         grow(out, size);
     }
     if (6 < size) {
@@ -327,7 +327,7 @@ dump_num(Out out, VALUE obj) {
     } else {
         *b = '0';
     }
-    if (out->end - out->cur < (long)(sizeof(buf) - (b - buf))) {
+    if (out->end - out->cur <= (long)(sizeof(buf) - (b - buf))) {
         grow(out, sizeof(buf) - (b - buf));
     }
     for (; '\0' != *b; b++) {
@@ -355,7 +355,7 @@ dump_time_thin(Out out, VALUE obj) {
     }
     b++;
     size = sizeof(buf) - (b - buf) - 1;
-    if (out->end - out->cur < size) {
+    if (out->end - out->cur <= size) {
         grow(out, size);
     }
     memcpy(out->cur, b, size);
@@ -370,7 +370,7 @@ dump_time_xsd(Out out, VALUE obj) {
     int         tzhour, tzmin;
     char        tzsign = '+';
 
-    if (out->end - out->cur < 33) {
+    if (out->end - out->cur <= 33) {
         grow(out, 33);
     }
     // 2010-07-09T10:47:45.895826+09:00
@@ -800,7 +800,7 @@ dump_gen_element(VALUE obj, unsigned int depth, Out out) {
         indent = depth * out->indent;
     }
     size = indent + 4 + nlen;
-    if (out->end - out->cur < (long)size) {
+    if (out->end - out->cur <= (long)size) {
         grow(out, size);
     }
     fill_indent(out, indent);
@@ -814,7 +814,7 @@ dump_gen_element(VALUE obj, unsigned int depth, Out out) {
         
         *out->cur++ = '>';
         do_indent = dump_gen_nodes(nodes, depth, out);
-        if (out->end - out->cur < (long)size) {
+        if (out->end - out->cur <= (long)size) {
             grow(out, size);
         }
         if (do_indent) {
@@ -867,7 +867,7 @@ dump_gen_attr(VALUE key, VALUE value, Out out) {
     size_t      klen = strlen(ks);
     size_t      size = 4 + klen + RSTRING_LEN(value);
     
-    if (out->end - out->cur < (long)size) {
+    if (out->end - out->cur <= (long)size) {
         grow(out, size);
     }
     *out->cur++ = ' ';
@@ -903,7 +903,7 @@ dump_gen_val_node(VALUE obj, unsigned int depth,
         indent = depth * out->indent;
     }
     size = indent + plen + slen + vlen;
-    if (out->end - out->cur < (long)size) {
+    if (out->end - out->cur <= (long)size) {
         grow(out, size);
     }
     fill_indent(out, indent);
@@ -945,7 +945,6 @@ write_obj_to_str(VALUE obj, Options copts) {
     struct _Out out;
     
     dump_obj_to_xml(obj, copts, &out);
-
     return out.buf;
 }
 

data/ext/ox/obj_load.c

@@ -107,7 +107,6 @@ resolve_classname(VALUE mod, const char *class_name, Effort effort) {
         }
         break;
     case AutoEffort:
-        //printf("*** auto %s\n", class_name);
         if (rb_const_defined_at(mod, ci)) {
             clas = rb_const_get_at(mod, ci);
         } else {

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module. 
-  VERSION = '1.2.6'
+  VERSION = '1.2.7'
 end

data/test/big.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby -wW1
+
+$: << '../lib'
+$: << '../ext'
+
+if __FILE__ == $0
+  while (i = ARGV.index('-I'))
+    x,path = ARGV.slice!(i, 2)
+    $: << path
+  end
+end
+
+require 'ox'
+
+def dump(cnt = 10000)
+  h = { }
+  cnt.times do |i|
+    h[i] = [i * 2, "this is #{i}"]
+  end
+  xml = Ox.dump(h)
+  puts "size: #{xml.size}"
+end
+
+dump(200000)

data/test/bug3.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby -wW1
+
+$: << '../lib'
+$: << '../ext'
+
+if __FILE__ == $0
+  if (i = ARGV.index('-I'))
+    x,path = ARGV.slice!(i, 2)
+    $: << path
+  end
+end
+
+require 'ox'
+
+def dump(cnt = 100000)
+  cnt.times do |i|
+    xml = Ox.dump([:inc, 1])
+    #puts xml
+    
+  end
+end
+
+dump()

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ox
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.2.6
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Peter Ohler
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-18 00:00:00 +09:00
+date: 2011-08-19 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -47,8 +51,10 @@ files:
 - ext/ox/obj_load.c
 - ext/ox/ox.c
 - ext/ox/parse.c
+- test/big.rb
 - test/bug1.rb
 - test/bug2.rb
+- test/bug3.rb
 - test/cache16_test.rb
 - test/cache8_test.rb
 - test/cache_test.rb
@@ -94,17 +100,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ox
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A fast XML parser and object serializer.