ox 2.14.12 → 2.14.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf4c5ff67edda493ebf9fd2a29fcee1584b0310f917094dec0a57eb93632f412
-  data.tar.gz: 7283aca3a2a2770f72696410a6691c131cfa2777562cd882f76bb0ea643c414e
+  metadata.gz: f9742d803f0730d6e9724d0f08809ec291b474beae8e966cf3b9ab3c95e165fa
+  data.tar.gz: 102f6dc50ee242f5a7cbb4e8395aa4004d826679b5b02f0e9734d3e8d206d7ec
 SHA512:
-  metadata.gz: e6ada04ac77531e74f5d40995d660d6e993d9c69685c586d15cbd9c896dfe6c60df879a51adecf5f5d3cb860b8bcb3fd80116a1001ae6eb5d15fbeb472be7118
-  data.tar.gz: 4053266ff36240627decb9eefbdc30e1afcb07bf36fed7ad639d2e1cfbff5165991f59ee1fdc985259f6dc60e4394e4782df98de9c73c2e51be911f39436d595
+  metadata.gz: 754fe3197d3944d4b398ba0334d62bc45d066448885e9a47ac8216c0a292203f273c4f0ab764a3ec4e5e49ebc472282ac89821aa0f03929491c60c659494e02b
+  data.tar.gz: 31f01b2ca8b2440511c9eda13fe590937bfd266173d83befcc81e228c0e8516545a29369755f1575c2e8bdb11aac791e463a397035fafed8e13848a23c8fb255

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All changes to the Ox gem are documented here. Releases follow semantic versioning.
 
+## [2.14.13] - 2023-01-16
+
+### Fixed
+
+- Fixed the intern cache to handle symbol memory changes.
+
 ## [2.14.12] - 2022-12-27
 
 ### Fixed

data/ext/ox/hash_load.c

@@ -35,7 +35,7 @@ mark_value(PInfo pi, VALUE val) {
 	pi->mark_size = MARK_INC;
     } else if (pi->mark_size <= pi->mark_cnt) {
 	pi->mark_size += MARK_INC;
-	pi->marked = REALLOC_N(pi->marked, VALUE, pi->mark_size);
+	REALLOC_N(pi->marked, VALUE, pi->mark_size);
     }
     pi->marked[pi->mark_cnt] = val;
     pi->mark_cnt++;

data/ext/ox/sax.c

@@ -762,6 +762,7 @@ CB:
  */
 static char read_element_start(SaxDrive dr) {
     const char    *ename = 0;
+    size_t         nlen;
     volatile VALUE name  = Qnil;
     char           c;
     int            closed;
@@ -790,6 +791,7 @@ static char read_element_start(SaxDrive dr) {
         0 == strcasecmp("html", dr->buf.str)) {
         dr->options.hints = ox_hints_html();
     }
+    nlen = dr->buf.tail - dr->buf.str - 1;
     if (NULL != dr->options.hints) {
         hint_clear_empty(dr);
         h = ox_hint_find(dr->options.hints, dr->buf.str);
@@ -810,7 +812,7 @@ static char read_element_start(SaxDrive dr) {
                 if (rb_respond_to(dr->handler, ox_abort_id)) {
                     VALUE args[1];
 
-                    args[0] = str2sym(dr, dr->buf.str, dr->buf.tail - dr->buf.str - 1, NULL);
+                    args[0] = str2sym(dr, dr->buf.str, nlen, NULL);
                     rb_funcall2(dr->handler, ox_abort_id, 1, args);
                 }
                 dr->abort = true;
@@ -861,7 +863,7 @@ static char read_element_start(SaxDrive dr) {
             }
         }
     }
-    name = str2sym(dr, dr->buf.str, dr->buf.tail - dr->buf.str - 1, &ename);
+    name = str2sym(dr, dr->buf.str, nlen, &ename);
     if (dr->has_start_element && 0 >= dr->blocked &&
         (NULL == h || ActiveOverlay == h->overlay || NestOverlay == h->overlay)) {
         VALUE args[1];
@@ -894,7 +896,7 @@ static char read_element_start(SaxDrive dr) {
     } else if (stackless) {
         end_element_cb(dr, name, pos, line, col, h);
     } else if (NULL != h && h->jump) {
-        stack_push(&dr->stack, ename, name, h);
+        stack_push(&dr->stack, ename, nlen, name, h);
         if ('>' != c) {
             ox_sax_drive_error(dr, WRONG_CHAR "element not closed");
             return c;
@@ -902,7 +904,7 @@ static char read_element_start(SaxDrive dr) {
         read_jump(dr, h->name);
         return '<';
     } else {
-        stack_push(&dr->stack, ename, name, h);
+        stack_push(&dr->stack, ename, nlen, name, h);
     }
     if ('>' != c) {
         ox_sax_drive_error(dr, WRONG_CHAR "element not closed");

data/ext/ox/sax_stack.h

@@ -6,11 +6,16 @@
 #ifndef OX_SAX_STACK_H
 #define OX_SAX_STACK_H
 
+#include <stdlib.h>
+
+#include "intern.h"
 #include "sax_hint.h"
 
 #define STACK_INC	32
+#define NV_BUF_MAX      64
 
 typedef struct _nv {
+    char	name_buf[NV_BUF_MAX];
     const char	*name;
     VALUE	val;
     int		childCnt;
@@ -44,7 +49,7 @@ stack_cleanup(NStack stack) {
 }
 
 inline static void
-stack_push(NStack stack, const char *name, VALUE val, Hint hint) {
+stack_push(NStack stack, const char *name, size_t nlen, VALUE val, Hint hint) {
     if (stack->end <= stack->tail) {
 	size_t	len = stack->end - stack->head;
 	size_t	toff = stack->tail - stack->head;
@@ -58,7 +63,13 @@ stack_push(NStack stack, const char *name, VALUE val, Hint hint) {
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + STACK_INC;
     }
-    stack->tail->name = name;
+    if (NV_BUF_MAX <= nlen) {
+        stack->tail->name = ox_strndup(name, nlen);
+    } else {
+        strncpy(stack->tail->name_buf, name, nlen);
+        stack->tail->name_buf[nlen] = '\0';
+        stack->tail->name = stack->tail->name_buf;
+    }
     stack->tail->val = val;
     stack->tail->hint = hint;
     stack->tail->childCnt = 0;
@@ -77,6 +88,9 @@ inline static Nv
 stack_pop(NStack stack) {
     if (stack->head < stack->tail) {
 	stack->tail--;
+        if (stack->tail->name != stack->tail->name_buf) {
+            free((char*)(stack->tail->name));
+        }
 	return stack->tail;
     }
     return 0;

data/lib/ox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.14.12
+  version: 2.14.13
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-27 00:00:00.000000000 Z
+date: 2023-01-16 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.