ox 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a1905c08bb18a23fdd9d6bad093f5f79739e40f
-  data.tar.gz: a7cc8928144cc81a3fbc94bb8b3602143c0a24ee
+  metadata.gz: c02a5320be65c6d6ebdb2c68c1144b11ffb6550e
+  data.tar.gz: 9ed8d1775aac38b0d8e2e72ccdbcfc9d6afce7fa
 SHA512:
-  metadata.gz: b43ea527105a1ba835bef03530d4b513a82740c29ff00da835ceab0fea564b3f47a324e35a3a02318ca5c69cec05f3dad2f97ed7599ee9205ff6ed53e564f58e
-  data.tar.gz: a4ca3469d113d213f24d4e5c3de06409637ab8be0410f4bd4da81a17cbf15a82ec354cd0754aad4e4ca54f4fc3f30c681722557970c490a69032c940611b6e8c
+  metadata.gz: 9aae30b11d2a715171653477f48162a815dbf3b79a5e6d68ba85290018c296402b8d140cf5eda323c9540bbcd1c1a84e91ac0737a7a1d2a0f95dc09fe69f68af
+  data.tar.gz: 47020f8ff6795ad9ff214b85ea4668e89f45462bf6968d54ad40f418ee5bbff72a00388aa115e46ffd5e78ff99abade2dbc8ebb15035e1853dc996a5e6929744

data/README.md

@@ -34,6 +34,10 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## Release Notes
 
+### Release 2.4.5
+
+- Thanks to GUI for fixing an infinite loop in Ox::Builder.
+
 ### Release 2.4.4
 
 - Builder element attributes with special characters are now encoded correctly.
@@ -42,12 +46,6 @@ A fast XML parser and Object marshaller as a Ruby gem.
   value of -1 indicates no terminating newline character and an indentation of
   zero.
 
-### Release 2.4.3
-
- - Fixed compiler warnings and errors.
-
- - Updated for Ruby 2.4.0.
-
 ## Description
 
 Optimized XML (Ox), as the name implies was written to provide speed optimized

data/ext/ox/builder.c

@@ -87,10 +87,12 @@ append_string(Builder b, const char *str, size_t size) {
 	
 	buf_append_string(&b->buf, str, size);
 	b->col += size;
-	while (NULL != (s = strchr(s, '\n'))) {
-	    b->line++;
-	    b->col = end - s;
-	}
+        s = strchr(s, '\n');
+        while (NULL != s) {
+            b->line++;
+            b->col = end - s;
+            s = strchr(s + 1, '\n');
+        }
 	b->pos += size;
     } else {
 	char	buf[256];
@@ -313,7 +315,7 @@ to_s(Builder b) {
  * which is the builder instance. The return value is then the generated string.
  *
  * - +options+ - (Hash) formating options
- *   - +:indent+ (Fixnum) indentaion level, negative leaves of terminating newline
+ *   - +:indent+ (Fixnum) indentaion level, negative values excludes terminating newline
  *   - +:size+ (Fixnum) the initial size of the string buffer
  */
 static VALUE
@@ -368,7 +370,7 @@ builder_new(int argc, VALUE *argv, VALUE self) {
  *
  * - +filename+ (String) filename to write to
  * - +options+ - (Hash) formating options
- *   - +:indent+ (Fixnum) indentaion level
+ *   - +:indent+ (Fixnum) indentaion level, negative values excludes terminating newline
  *   - +:size+ (Fixnum) the initial size of the string buffer
  */
 static VALUE
@@ -430,7 +432,7 @@ builder_file(int argc, VALUE *argv, VALUE self) {
  *
  * - +io+ (String) IO to write to
  * - +options+ - (Hash) formating options
- *   - +:indent+ (Fixnum) indentaion level
+ *   - +:indent+ (Fixnum) indentaion level, negative values excludes terminating newline
  *   - +:size+ (Fixnum) the initial size of the string buffer
  */
 static VALUE
@@ -714,9 +716,11 @@ builder_cdata(VALUE self, VALUE data) {
     b->pos += 9;
     buf_append_string(&b->buf, str, len);
     b->col += len;
-    while (NULL != (s = strchr(s, '\n'))) {
-	b->line++;
-	b->col = end - s;
+    s = strchr(s, '\n');
+    while (NULL != s) {
+        b->line++;
+        b->col = end - s;
+        s = strchr(s + 1, '\n');
     }
     b->pos += len;
     buf_append_string(&b->buf, "]]>", 3);
@@ -751,9 +755,11 @@ builder_raw(VALUE self, VALUE text) {
     i_am_a_child(b, true);
     buf_append_string(&b->buf, str, len);
     b->col += len;
-    while (NULL != (s = strchr(s, '\n'))) {
-	b->line++;
-	b->col = end - s;
+    s = strchr(s, '\n');
+    while (NULL != s) {
+        b->line++;
+        b->col = end - s;
+        s = strchr(s + 1, '\n');
     }
     b->pos += len;
 

data/ext/ox/ox.c

@@ -695,7 +695,7 @@ load(char *xml, int argc, VALUE *argv, VALUE self, VALUE encoding, Err err) {
 	    } else if (skip_white_sym == v) {
 		options.skip = SpcSkip;
 	    } else {
-		rb_raise(ox_parse_error_class, ":effort must be :skip_none, :skip_return, or :skip_white.\n");
+		rb_raise(ox_parse_error_class, ":skip must be :skip_none, :skip_return, or :skip_white.\n");
 	    }
 	}
 

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-09-11 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