ox 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 232bced785428a91e7638a049331d4f5df83974e
-  data.tar.gz: 23620f39d27521174900856190b6ced9d3715427
+  metadata.gz: 066b29e775aa1fbf8beb40e572299a3b99155c92
+  data.tar.gz: 41c0e36f4f7bbebcef8f27c7e75d80c3c6420423
 SHA512:
-  metadata.gz: 8f5fe521ffeb36fe836b331bf7f7d9b2888e6aa27ff4873224a6084de055289fa19258b47bdc9d49acae5495834a46834001ee81f2cdbcb8cd85e8fa75f84cf3
-  data.tar.gz: 5c80d1a9b238bc452c67fee28739238c385dc28c4641dadec6dbfe0f4408e5c0cc1f0e18d4c2df51fa9ee3d0d1c9b790d5d3f929bd1d3255241451248f591353
+  metadata.gz: fbdf712b54810a1bff6c211d0f4b7e63ee8a1ed48911b4d43491c3792acd44c3f32bdc6da7028f8de87dfcc937162bb8116e13c9d73c1a60998a7eafb71efa24
+  data.tar.gz: f7378812079495da8752277b52c7372e739b848e24cf1845eb6e1d48e625d560c93374373d7d429b2612111b2173a9ce180a32385734e3b2f8e073f0937b143a

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+## 2.8.2 - November 1, 2017
+
+  - Fixed bug with SAX parser that caused a crash with very long invalid instruction element.
+
+  - Fixed SAX parse error with double <source> elements.
+
 ## 2.8.1 - October 27, 2017
 
   - Avoid crash with invalid XML passed to Oj.parse_obj().

data/ext/ox/ox.c

@@ -537,8 +537,8 @@ set_def_opts(VALUE self, VALUE opts) {
 	Check_Type(v, T_STRING);
 	slen = RSTRING_LEN(v);
 	if (sizeof(ox_default_options.inv_repl) - 2 < (size_t)slen) {
-	    rb_raise(ox_parse_error_class, ":invalid_replace can be no longer than %ld characters.",
-		     sizeof(ox_default_options.inv_repl) - 2);
+	    rb_raise(ox_parse_error_class, ":invalid_replace can be no longer than %d characters.",
+		     (int)sizeof(ox_default_options.inv_repl) - 2);
 	}
 	strncpy(ox_default_options.inv_repl + 1, StringValuePtr(v), sizeof(ox_default_options.inv_repl) - 1);
 	ox_default_options.inv_repl[sizeof(ox_default_options.inv_repl) - 1] = '\0';
@@ -558,8 +558,8 @@ set_def_opts(VALUE self, VALUE opts) {
 	Check_Type(v, T_STRING);
 	slen = RSTRING_LEN(v);
 	if (sizeof(ox_default_options.strip_ns) - 1 < (size_t)slen) {
-	    rb_raise(ox_parse_error_class, ":strip_namespace can be no longer than %ld characters.",
-		     sizeof(ox_default_options.strip_ns) - 1);
+	    rb_raise(ox_parse_error_class, ":strip_namespace can be no longer than %d characters.",
+		     (int)sizeof(ox_default_options.strip_ns) - 1);
 	}
 	strncpy(ox_default_options.strip_ns, StringValuePtr(v), sizeof(ox_default_options.strip_ns) - 1);
 	ox_default_options.strip_ns[sizeof(ox_default_options.strip_ns) - 1] = '\0';
@@ -572,8 +572,8 @@ set_def_opts(VALUE self, VALUE opts) {
 	Check_Type(v, T_STRING);
 	slen = RSTRING_LEN(v);
 	if (sizeof(ox_default_options.margin) - 1 < (size_t)slen) {
-	    rb_raise(ox_parse_error_class, ":margin can be no longer than %ld characters.",
-		     sizeof(ox_default_options.margin) - 1);
+	    rb_raise(ox_parse_error_class, ":margin can be no longer than %d characters.",
+		     (int)sizeof(ox_default_options.margin) - 1);
 	}
 	strncpy(ox_default_options.margin, StringValuePtr(v), sizeof(ox_default_options.margin) - 1);
 	ox_default_options.margin[sizeof(ox_default_options.margin) - 1] = '\0';
@@ -769,8 +769,8 @@ load(char *xml, int argc, VALUE *argv, VALUE self, VALUE encoding, Err err) {
 	    Check_Type(v, T_STRING);
 	    slen = RSTRING_LEN(v);
 	    if (sizeof(options.inv_repl) - 2 < (size_t)slen) {
-		rb_raise(ox_parse_error_class, ":invalid_replace can be no longer than %ld characters.",
-			 sizeof(options.inv_repl) - 2);
+		rb_raise(ox_parse_error_class, ":invalid_replace can be no longer than %d characters.",
+			 (int)sizeof(options.inv_repl) - 2);
 	    }
 	    strncpy(options.inv_repl + 1, StringValuePtr(v), sizeof(options.inv_repl) - 1);
 	    options.inv_repl[sizeof(options.inv_repl) - 1] = '\0';
@@ -789,8 +789,8 @@ load(char *xml, int argc, VALUE *argv, VALUE self, VALUE encoding, Err err) {
 	    Check_Type(v, T_STRING);
 	    slen = RSTRING_LEN(v);
 	    if (sizeof(options.strip_ns) - 1 < (size_t)slen) {
-		rb_raise(ox_parse_error_class, ":strip_namespace can be no longer than %ld characters.",
-			 sizeof(options.strip_ns) - 1);
+		rb_raise(ox_parse_error_class, ":strip_namespace can be no longer than %d characters.",
+			 (int)sizeof(options.strip_ns) - 1);
 	    }
 	    strncpy(options.strip_ns, StringValuePtr(v), sizeof(options.strip_ns) - 1);
 	    options.strip_ns[sizeof(options.strip_ns) - 1] = '\0';
@@ -802,8 +802,8 @@ load(char *xml, int argc, VALUE *argv, VALUE self, VALUE encoding, Err err) {
 	    Check_Type(v, T_STRING);
 	    slen = RSTRING_LEN(v);
 	    if (sizeof(options.margin) - 1 < (size_t)slen) {
-		rb_raise(ox_parse_error_class, ":margin can be no longer than %ld characters.",
-			 sizeof(options.margin) - 1);
+		rb_raise(ox_parse_error_class, ":margin can be no longer than %d characters.",
+			 (int)sizeof(options.margin) - 1);
 	    }
 	    strncpy(options.margin, StringValuePtr(v), sizeof(options.margin) - 1);
 	    options.margin[sizeof(options.margin) - 1] = '\0';
@@ -1055,8 +1055,8 @@ sax_parse(int argc, VALUE *argv, VALUE self) {
 		Check_Type(v, T_STRING);
 		slen = RSTRING_LEN(v);
 		if (sizeof(options.strip_ns) - 1 <  (size_t)slen) {
-		    rb_raise(ox_parse_error_class, ":strip_namespace can be no longer than %ld characters.",
-			     sizeof(options.strip_ns) - 1);
+		    rb_raise(ox_parse_error_class, ":strip_namespace can be no longer than %d characters.",
+			     (int)sizeof(options.strip_ns) - 1);
 		}
 		strncpy(options.strip_ns, StringValuePtr(v), sizeof(options.strip_ns) - 1);
 		options.strip_ns[sizeof(options.strip_ns) - 1] = '\0';
@@ -1209,8 +1209,8 @@ parse_dump_options(VALUE ropts, Options copts) {
 	    Check_Type(v, T_STRING);
 	    slen = RSTRING_LEN(v);
 	    if (sizeof(copts->inv_repl) - 2 <  (size_t)slen) {
-		rb_raise(ox_parse_error_class, ":invalid_replace can be no longer than %ld characters.",
-			 sizeof(copts->inv_repl) - 2);
+		rb_raise(ox_parse_error_class, ":invalid_replace can be no longer than %d characters.",
+			 (int)sizeof(copts->inv_repl) - 2);
 	    }
 	    strncpy(copts->inv_repl + 1, StringValuePtr(v), sizeof(copts->inv_repl) - 1);
 	    copts->inv_repl[sizeof(copts->inv_repl) - 1] = '\0';
@@ -1224,8 +1224,8 @@ parse_dump_options(VALUE ropts, Options copts) {
 	    Check_Type(v, T_STRING);
 	    slen = RSTRING_LEN(v);
 	    if (sizeof(copts->margin) - 2 <  (size_t)slen) {
-		rb_raise(ox_parse_error_class, ":margin can be no longer than %ld characters.",
-			 sizeof(copts->margin) - 2);
+		rb_raise(ox_parse_error_class, ":margin can be no longer than %d characters.",
+			 (int)sizeof(copts->margin) - 2);
 	    }
 	    strncpy(copts->margin, StringValuePtr(v), sizeof(copts->margin) - 1);
 	    copts->margin[sizeof(copts->margin) - 1] = '\0';

data/ext/ox/sax.c

@@ -448,7 +448,8 @@ read_content(SaxDrive dr, char *content, size_t len) {
     char	*end = content + len;
 
     while ('\0' != (c = buf_get(&dr->buf))) {
-	if (end < content) {
+	if (end <= content) {
+	    *content = '\0';
 	    ox_sax_drive_error(dr, "processing instruction content too large");
 	    return;
 	}
@@ -473,9 +474,9 @@ read_content(SaxDrive dr, char *content, size_t len) {
  */
 static char
 read_instruction(SaxDrive dr) {
-    char	content[1024];
+    char	content[4096];
     char        c;
-    char	*cend;
+    int		coff;
     VALUE	target = Qnil;
     int		is_xml;
     int		pos = dr->buf.pos - 1;
@@ -510,7 +511,7 @@ read_instruction(SaxDrive dr) {
     line = dr->buf.line;
     col = dr->buf.col;
     read_content(dr, content, sizeof(content) - 1);
-    cend = dr->buf.tail;
+    coff = dr->buf.tail - dr->buf.head;
     buf_reset(&dr->buf);
     dr->err = 0;
     c = read_attrs(dr, c, '?', '?', is_xml, 1, NULL);
@@ -545,7 +546,7 @@ read_instruction(SaxDrive dr) {
 	    }
 	    rb_funcall2(dr->handler, ox_text_id, 1, args);
 	}
-	dr->buf.tail = cend;
+	dr->buf.tail = dr->buf.head + coff;
 	c = buf_get(&dr->buf);
     } else {
 	pos = dr->buf.pos;
@@ -925,7 +926,7 @@ read_element_start(SaxDrive dr) {
 		    end_element_cb(dr, top_nv->val, pos, line, col, top_nv->hint);
 		    top_nv = stack_peek(&dr->stack);
 		}
-		if (0 != h->parents && NestOverlay != h->overlay) {
+		if (NULL != top_nv && 0 != h->parents && NestOverlay != h->overlay) {
 		    const char	**p;
 		    int		ok = 0;
 

data/ext/ox/sax_buf.c

@@ -73,7 +73,7 @@ int
 ox_sax_buf_read(Buf buf) {
     int         err;
     size_t      shift = 0;
-    
+
     // if there is not much room to read into, shift or realloc a larger buffer.
     if (buf->head < buf->tail && 4096 > buf->end - buf->tail) {
         if (0 == buf->pro) {

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-01 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