ox 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0f1c9717a0c2a666b6131188f72dcb26b88230
-  data.tar.gz: 93edf8cebd1ef9390ee531b957aa2369b4542a92
+  metadata.gz: 2b9a20f56f4e7eb7090f1ed2a58eab7f85276585
+  data.tar.gz: 7c2c55961c8286576d47b925d97f1073ab9722cd
 SHA512:
-  metadata.gz: 7f2a045152966f88e3ed61aa5804810e3584afc8b05ba129b627c86e7343d9263b95bf39531158bed3d349e8b7dfc2cc7a1f58e7fe2023b53ecd004756e5d345
-  data.tar.gz: cf8ab5d25d451ffaf01b8029f72c41bfdb521637189ed3df4a60e7e4ebd566ce8ada66bb397149aa60e9ca9958cf5a0553bb5616c42add5f418b8d4fc8ef7b3f
+  metadata.gz: 97a5d814b0cc4329c0c0014bc5c42276bba065c7bfda21b3f1056d0993530ff19b11485c34a72c75c85f6dea04798568985e81b73a7ba2fc6f91745ad4a3c847
+  data.tar.gz: b21814309b97237dde61f86312881a91d645a7fa873e1d4dbc5c14c1a7d28df17215180296f5288612451df904a47e3171af4d4564e0ec34c45151cf5cc3a432

data/README.md

@@ -34,9 +34,13 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 2.0.5
+### Release 2.0.6
 
- - Better support for special character encoding with 1.8.7.
+ - Fixed bug in special character decoding that chopped of text.
+
+ - Limit depth on dump to 1000 to avoid core dump on circular references if the user does not specify circular.
+
+ - Handles dumping non-string values for attributes correctly by converting the value to a string.
 
 ## <a name="description">Description</a>
 

data/ext/ox/dump.c

@@ -39,6 +39,7 @@
 #include "ox.h"
 
 #define USE_B64	0
+#define MAX_DEPTH 1000
 
 typedef unsigned long   ulong;
 
@@ -74,13 +75,13 @@ typedef struct _Out {
 static void     dump_obj_to_xml(VALUE obj, Options copts, Out out);
 
 static void     dump_first_obj(VALUE obj, Out out);
-static void     dump_obj(ID aid, VALUE obj, unsigned int depth, Out out);
-static void     dump_gen_doc(VALUE obj, unsigned int depth, Out out);
-static void     dump_gen_element(VALUE obj, unsigned int depth, Out out);
-static void	dump_gen_instruct(VALUE obj, unsigned int depth, Out out);
+static void     dump_obj(ID aid, VALUE obj, int depth, Out out);
+static void     dump_gen_doc(VALUE obj, int depth, Out out);
+static void     dump_gen_element(VALUE obj, int depth, Out out);
+static void	dump_gen_instruct(VALUE obj, int depth, Out out);
 static int      dump_gen_attr(VALUE key, VALUE value, Out out);
-static int      dump_gen_nodes(VALUE obj, unsigned int depth, Out out);
-static void     dump_gen_val_node(VALUE obj, unsigned int depth,
+static int      dump_gen_nodes(VALUE obj, int depth, Out out);
+static void     dump_gen_val_node(VALUE obj, int depth,
                                   const char *pre, size_t plen,
                                   const char *suf, size_t slen, Out out);
 
@@ -102,7 +103,7 @@ static int      is_xml_friendly(const uchar *str, int len);
 
 static const char	hex_chars[17] = "0123456789abcdef";
 
-static char     xml_friendly_chars[256] = "\
+static char     xml_friendly_chars[257] = "\
 88888888811881888888888888888888\
 11611156111111111111111111114141\
 11111111111111111111111111111111\
@@ -553,12 +554,15 @@ dump_first_obj(VALUE obj, Out out) {
 }
 
 static void
-dump_obj(ID aid, VALUE obj, unsigned int depth, Out out) {
+dump_obj(ID aid, VALUE obj, int depth, Out out) {
     struct _Element     e;
     VALUE		prev_obj = out->obj;
     char                value_buf[64];
     int                 cnt;
 
+    if (MAX_DEPTH < depth) {
+	rb_raise(rb_eSysStackError, "maximum depth exceeded");
+    }
     out->obj = obj;
     if (0 == aid) {
         /*e.attr.str = 0; */
@@ -985,7 +989,7 @@ dump_hash(VALUE key, VALUE value, Out out) {
 }
 
 static void
-dump_gen_doc(VALUE obj, unsigned int depth, Out out) {
+dump_gen_doc(VALUE obj, int depth, Out out) {
     VALUE       attrs = rb_attr_get(obj, ox_attributes_id);
     VALUE       nodes = rb_attr_get(obj, ox_nodes_id);
 
@@ -1018,7 +1022,7 @@ dump_gen_doc(VALUE obj, unsigned int depth, Out out) {
 }
 
 static void
-dump_gen_element(VALUE obj, unsigned int depth, Out out) {
+dump_gen_element(VALUE obj, int depth, Out out) {
     VALUE       rname = rb_attr_get(obj, ox_at_value_id);
     VALUE       attrs = rb_attr_get(obj, ox_attributes_id);
     VALUE       nodes = rb_attr_get(obj, ox_nodes_id);
@@ -1066,7 +1070,7 @@ dump_gen_element(VALUE obj, unsigned int depth, Out out) {
 }
 
 static void
-dump_gen_instruct(VALUE obj, unsigned int depth, Out out) {
+dump_gen_instruct(VALUE obj, int depth, Out out) {
     VALUE	rname = rb_attr_get(obj, ox_at_value_id);
     VALUE	attrs = rb_attr_get(obj, ox_attributes_id);
     VALUE	rcontent = rb_attr_get(obj, ox_at_content_id);
@@ -1100,7 +1104,7 @@ dump_gen_instruct(VALUE obj, unsigned int depth, Out out) {
 }
 
 static int
-dump_gen_nodes(VALUE obj, unsigned int depth, Out out) {
+dump_gen_nodes(VALUE obj, int depth, Out out) {
     long        cnt = RARRAY_LEN(obj);
     int         indent_needed = 1;
     
@@ -1109,6 +1113,9 @@ dump_gen_nodes(VALUE obj, unsigned int depth, Out out) {
         VALUE		clas;
         int		d2 = depth + 1;
 
+	if (MAX_DEPTH < depth) {
+	    rb_raise(rb_eSysStackError, "maximum depth exceeded");
+	}
         for (; 0 < cnt; cnt--, np++) {
             clas = rb_obj_class(*np);
             if (ox_element_clas == clas) {
@@ -1135,16 +1142,31 @@ dump_gen_nodes(VALUE obj, unsigned int depth, Out out) {
 
 static int
 dump_gen_attr(VALUE key, VALUE value, Out out) {
+    const char	*ks;
+    size_t      klen;
+    size_t      size;
+
 #if HAS_PRIVATE_ENCODING
     // There seems to be a bug in jruby for converting symbols to strings and preserving the encoding. This is a work
     // around.
-    const char	*ks = rb_str_ptr(rb_String(key));
+    ks = rb_str_ptr(rb_String(key));
 #else
-    const char  *ks = (T_SYMBOL == rb_type(key)) ? rb_id2name(SYM2ID(key)) : StringValuePtr(key);
+    switch (rb_type(key)) {
+    case T_SYMBOL:
+	ks = rb_id2name(SYM2ID(key));
+	break;
+    case T_STRING:
+	ks = StringValuePtr(key);
+	break;
+    default:
+	key = rb_String(key);
+	ks = StringValuePtr(key);
+	break;
+    }
 #endif
-    size_t      klen = strlen(ks);
-    size_t      size = 4 + klen + RSTRING_LEN(value);
-
+    klen = strlen(ks);
+    value = rb_String(value);
+    size = 4 + klen + RSTRING_LEN(value);
     if (out->end - out->cur <= (long)size) {
         grow(out, size);
     }
@@ -1159,7 +1181,7 @@ dump_gen_attr(VALUE key, VALUE value, Out out) {
 }
 
 static void
-dump_gen_val_node(VALUE obj, unsigned int depth,
+dump_gen_val_node(VALUE obj, int depth,
                   const char *pre, size_t plen,
                   const char *suf, size_t slen, Out out) {
     VALUE       v = rb_attr_get(obj, ox_at_value_id);

data/ext/ox/ox.c

@@ -30,6 +30,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 

data/ext/ox/sax.c

@@ -1179,7 +1179,6 @@ ox_sax_collapse_special(SaxDrive dr, char *str, int line, int col) {
         if ('&' == *s) {
             int         c = 0;
             char        *end;
-	    //int		x = 0;
 
             s++;
             if ('#' == *s) {
@@ -1236,6 +1235,7 @@ ox_sax_collapse_special(SaxDrive dr, char *str, int line, int col) {
 		    continue;
 		}
 		s = end + 1;
+		continue;
             } else if (0 == strncasecmp(s, "lt;", 3)) {
                 c = '<';
                 s += 3;

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies: []
 description: "A fast XML parser and object serializer that uses only standard C lib.\n
   \           \nOptimized XML (Ox), as the name implies was written to provide speed
@@ -90,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ox
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A fast XML parser and object serializer.
 test_files: []
-has_rdoc: true