ox 2.14.8 → 2.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 141360789b82c7bdc927d64818b673c91f2c0ca585c9d00eab8f81324c5b56e2
-  data.tar.gz: 0b19c86cce35dcc00c4da5b526722580eedcb7dd5edce9eb96ccd99407f4ca84
+  metadata.gz: a3cc19bc7d94f71b8e8252f3b22475383d3700b2cfe7f3e97aeaff4c36dc4730
+  data.tar.gz: 0034552f9848f7215d7533066d5a971c59dbfd1526257b479512489fe30e371b
 SHA512:
-  metadata.gz: cbfe081ac34c6fbea4719156f0666d9554d2c25b23e52546c95cc5fbae89105dfe1aef0c6b5ad659bea540bbcf6bd87b4ea661d9e82fdd3798db6f41eecb3bcd
-  data.tar.gz: a7946c2929b553b5c019dc5ee43a07fb289aa7e5f93ae3ad890862f018310efb5fa172822944a2be5178f88884d6404daa0d7bdc9dd8b733e1a8a55547909ca8
+  metadata.gz: b6ea9d757870451eaf28771481fe703ade50de9dc85d91575545be65ba0a65d7a71a4d193684130725ccad58ad506e1b47fd241aef92950c619be7d49779cbef
+  data.tar.gz: cdd97b3ee73f8755cc7a4296c64d41553b03619c7f37f561ad55b958e769e0dc65e652800da0a03b1a9ecb74a17b563188f01a1b8f86fed2d01395ec2eabd587

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All changes to the Ox gem are documented here. Releases follow semantic versioning.
 
+## [2.14.9] - 2022-02-11
+
+### Fixed
+
+- Fixed the `\r` replacement with `\n` with the SAX parser according to https://www.w3.org/TR/2008/REC-xml-20081126/#sec-line-ends.
+
 ## [2.14.8] - 2022-02-09
 
 ### Fixed

data/ext/ox/parse.c

@@ -108,7 +108,7 @@ static void fix_newlines(char *buf) {
 		if ('\n' == *(s + 1)) {
 		    continue;
 		}
-		*s = '\n';
+		*d = '\n';
 	    } else if (d < s) {
 		*d = *s;
 	    }

data/ext/ox/sax.c

@@ -307,8 +307,8 @@ static void sax_drive_init(SaxDrive dr, VALUE handler, VALUE io, SaxOptions opti
         dr->encoding = rb_enc_find(ox_default_options.encoding);
     }
     dr->utf8 = (NULL == dr->encoding || rb_utf8_encoding() == dr->encoding);
-    if (NULL == dr->encoding || rb_utf8_encoding() == dr->encoding) {  // UTF-8
-        dr->get_name = dr->options.symbolize ? ox_utf8_sym : ox_utf8_name; // TBD UTF8 sym?
+    if (NULL == dr->encoding || rb_utf8_encoding() == dr->encoding) {       // UTF-8
+        dr->get_name = dr->options.symbolize ? ox_utf8_sym : ox_utf8_name;  // TBD UTF8 sym?
     } else {
         dr->get_name = dr->options.symbolize ? ox_enc_sym : ox_enc_name;
     }
@@ -334,7 +334,7 @@ static char skipBOM(SaxDrive dr) {
     if (0xEF == (uint8_t)c) { /* only UTF8 is supported */
         if (0xBB == (uint8_t)buf_get(&dr->buf) && 0xBF == (uint8_t)buf_get(&dr->buf)) {
             dr->encoding = ox_utf8_encoding;
-            c = buf_get(&dr->buf);
+            c            = buf_get(&dr->buf);
         } else {
             ox_sax_drive_error(dr, BAD_BOM "invalid BOM or a binary file.");
             c = '\0';
@@ -1217,7 +1217,7 @@ static char read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml,
             attr_value = dr->buf.str;
             if (is_encoding) {
                 dr->encoding = rb_enc_find(dr->buf.str);
-                is_encoding = 0;
+                is_encoding  = 0;
             }
         }
         if (0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay || NestOverlay == h->overlay)) {
@@ -1368,7 +1368,8 @@ int ox_sax_collapse_special(SaxDrive dr, char *str, long pos, long line, long co
     char *b = str;
 
     while ('\0' != *s) {
-        if ('&' == *s) {
+        switch (*s) {
+        case '&': {
             int   c = 0;
             char *end;
 
@@ -1458,13 +1459,25 @@ int ox_sax_collapse_special(SaxDrive dr, char *str, long pos, long line, long co
             }
             *b++ = (char)c;
             col++;
-        } else {
+            break;
+        }
+        case '\r':
+	    s++;
             if ('\n' == *s) {
-                line++;
-                col = 0;
-            }
+		continue;
+	    }
+	    line++;
+	    col = 1;
+            *b++ = '\n';
+	    break;
+	case '\n':
+	    line++;
+	    col = 0;
+	    // fall through
+        default:
             col++;
             *b++ = *s++;
+            break;
         }
     }
     *b = '\0';

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.14.8
+  version: 2.14.9
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-02-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 optimized\nXML handling.