ox 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af2271c3c5cd6947ce101436041312351fd0d4f5
-  data.tar.gz: c1589595a362f3fe1111fc633c33626e529c6792
+  metadata.gz: 232bced785428a91e7638a049331d4f5df83974e
+  data.tar.gz: 23620f39d27521174900856190b6ced9d3715427
 SHA512:
-  metadata.gz: 62b558973eb617a8cc52c44b222babfaf8315433385265deea21abca52cbd5994146befbfbb785bc3878663aa2e2fc053fe101bf7e0982c0464f06d9114e9b41
-  data.tar.gz: e86031b3635268f92f19f9e17f2a1619a0729e01c3bde9652f26097c24a3a9665335b4a49d6a5840ade33d7690d41c17a3d27088d08166b54e0aad1ca111d680
+  metadata.gz: 8f5fe521ffeb36fe836b331bf7f7d9b2888e6aa27ff4873224a6084de055289fa19258b47bdc9d49acae5495834a46834001ee81f2cdbcb8cd85e8fa75f84cf3
+  data.tar.gz: 5c80d1a9b238bc452c67fee28739238c385dc28c4641dadec6dbfe0f4408e5c0cc1f0e18d4c2df51fa9ee3d0d1c9b790d5d3f929bd1d3255241451248f591353

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 
+## 2.8.1 - October 27, 2017
+
+  - Avoid crash with invalid XML passed to Oj.parse_obj().
+
 ## 2.8.0 - September 22, 2017
 
   - Added :skip_off mode to make sax callback on every none empty string even

data/README.md

@@ -6,7 +6,7 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Documentation
 
-*Documentation*: http://www.ohler.com/ox/doc
+*Documentation*: http://www.ohler.com/ox
 
 ## Source
 
@@ -22,6 +22,10 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 [![Build Status](https://secure.travis-ci.org/ohler55/ox.png?branch=master)](http://travis-ci.org/ohler55/ox)
 
+## Donate
+
+[![Gratipay](https://img.shields.io/gratipay/project/ox.svg)](https://gratipay.com/ox/)
+
 ## Links of Interest
 
 [Ruby XML Gem Comparison](http://www.ohler.com/dev/xml_with_ruby/xml_with_ruby.html) for a performance comparison between Ox, Nokogiri, and LibXML.

data/ext/ox/err.c

@@ -17,7 +17,11 @@ ox_err_set(Err e, VALUE clas, const char *format, ...) {
     va_end(ap);
 }
 
+#if __GNUC__ > 4
 _Noreturn void
+#else
+void
+#endif
 ox_err_raise(Err e) {
     rb_raise(e->clas, "%s", e->msg);
 }

data/ext/ox/obj_load.c

@@ -776,8 +776,10 @@ end_element(PInfo pi, const char *ename) {
 		    Helper	gh;
 
 		    helper_stack_pop(&pi->helpers);
-		    gh = helper_stack_peek(&pi->helpers);
-
+		    if (NULL == (gh = helper_stack_peek(&pi->helpers))) {
+			set_error(&pi->err, "Corrupt parse stack, container is wrong type", pi->str, pi->s);
+			return;
+		    }
 		    rb_hash_aset(gh->obj, ph->obj, h->obj);
 		}
 		break;

data/ext/ox/ox.c

@@ -1514,7 +1514,11 @@ void Init_ox() {
 #endif
 }
 
+#if __GNUC__ > 4
 _Noreturn void
+#else
+void
+#endif
 _ox_raise_error(const char *msg, const char *xml, const char *current, const char* file, int line) {
     int	xline = 1;
     int	col = 1;

data/lib/ox/version.rb

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

metadata

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