oj 3.14.1 → 3.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85912fe57610093a2cd9a8aeed44ac537bfe329c17988ea56624ec55f11fb9f5
-  data.tar.gz: f44e342c4381b4487e32ef82ec686ac47115061480c74c835d93bdb12e4c8b7b
+  metadata.gz: 35277d429b423f078c9c259bc2f7d8fd5714f55bb67def193b2b58c1352f3d11
+  data.tar.gz: 337ca936375237d94a5e6a6ece01abd28ce367119fbb72b53dc41c3248c9e136
 SHA512:
-  metadata.gz: a2cfa1959b394dd3a3313fd23756b98efb8a32232d4204892e9c29843e61f05d3cd9288337609fc6e67275a2c383cd2f835e028d66084e873b737f0cd4bb9211
-  data.tar.gz: 9364d9503225952d51a9e9fb8ff8b6a6fb74424b7a2adad2d5d1b0f11ebf06c02230553ff8f8c3f0f991fe315e1a6c1904e9e420b56a2832b0c5e48cfe3dd6e3
+  metadata.gz: e41c8ef241150e82943a92becc0ca0ec501d3ea9f9a2729abcb2529f2f5ac4360bb0a7684d46fd2357c0edb81d9347b5a6228129536c24157df5b0a788a4fc22
+  data.tar.gz: 6b69fcd20fe9956826865a8fafbca921ae0d9d39f43fbb3aa713b8411381852bcbfa16f7b3a3557e0c24e0545fb0a82c120c93c24bcd81ea8616b89fb6db2b47

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.14.2 - 2023-02-10
+
+- Fixed check for \0 in strings.
+
 ## 3.14.1 - 2023-02-01
 
 - Fixed issue with uninitialized handler for Oj::Parser::Saj.

data/ext/oj/buf.h

@@ -5,6 +5,7 @@
 #define OJ_BUF_H
 
 #include "ruby.h"
+#include "mem.h"
 
 typedef struct _buf {
     char *head;
@@ -25,7 +26,7 @@ inline static void buf_reset(Buf buf) {
 
 inline static void buf_cleanup(Buf buf) {
     if (buf->base != buf->head) {
-        xfree(buf->head);
+        OJ_R_FREE(buf->head);
     }
 }
 
@@ -49,10 +50,10 @@ inline static void buf_append_string(Buf buf, const char *s, size_t slen) {
         size_t new_len = len + slen + len / 2;
 
         if (buf->base == buf->head) {
-            buf->head = ALLOC_N(char, new_len);
+            buf->head = OJ_R_ALLOC_N(char, new_len);
             memcpy(buf->head, buf->base, len);
         } else {
-            REALLOC_N(buf->head, char, new_len);
+            OJ_R_REALLOC_N(buf->head, char, new_len);
         }
         buf->tail = buf->head + toff;
         buf->end  = buf->head + new_len - 1;
@@ -68,10 +69,10 @@ inline static void buf_append(Buf buf, char c) {
         size_t new_len = len + len / 2;
 
         if (buf->base == buf->head) {
-            buf->head = ALLOC_N(char, new_len);
+            buf->head = OJ_R_ALLOC_N(char, new_len);
             memcpy(buf->head, buf->base, len);
         } else {
-            REALLOC_N(buf->head, char, new_len);
+            OJ_R_REALLOC_N(buf->head, char, new_len);
         }
         buf->tail = buf->head + toff;
         buf->end  = buf->head + new_len - 1;

data/ext/oj/cache.c

@@ -6,6 +6,7 @@
 #endif
 #include <stdlib.h>
 
+#include "mem.h"
 #include "cache.h"
 
 // The stdlib calloc, realloc, and free are used instead of the Ruby ALLOC,
@@ -100,7 +101,7 @@ static void rehash(Cache c) {
     osize    = c->size;
     c->size  = osize * 4;
     c->mask  = c->size - 1;
-    c->slots = realloc((void *)c->slots, sizeof(Slot) * c->size);
+    c->slots = OJ_REALLOC((void *)c->slots, sizeof(Slot) * c->size);
     memset((Slot *)c->slots + osize, 0, sizeof(Slot) * osize * 3);
     end = (Slot *)c->slots + osize;
     for (sp = (Slot *)c->slots; sp < end; sp++) {
@@ -128,7 +129,7 @@ static VALUE lockless_intern(Cache c, const char *key, size_t len) {
     while (REUSE_MAX < c->rcnt) {
         if (NULL != (b = c->reuse)) {
             c->reuse = b->next;
-            free(b);
+            OJ_FREE(b);
             c->rcnt--;
         } else {
             // An accounting error occured somewhere so correct it.
@@ -143,7 +144,7 @@ static VALUE lockless_intern(Cache c, const char *key, size_t len) {
     }
     rkey = c->form(key, len);
     if (NULL == (b = c->reuse)) {
-        b = calloc(1, sizeof(struct _slot));
+        b = OJ_CALLOC(1, sizeof(struct _slot));
     } else {
         c->reuse = b->next;
         c->rcnt--;
@@ -174,7 +175,7 @@ static VALUE locking_intern(Cache c, const char *key, size_t len) {
     while (REUSE_MAX < c->rcnt) {
         if (NULL != (b = c->reuse)) {
             c->reuse = b->next;
-            free(b);
+            OJ_FREE(b);
             c->rcnt--;
         } else {
             // An accounting error occured somewhere so correct it.
@@ -200,7 +201,7 @@ static VALUE locking_intern(Cache c, const char *key, size_t len) {
     }
     CACHE_UNLOCK(c);
     if (NULL == b) {
-        b = calloc(1, sizeof(struct _slot));
+        b = OJ_CALLOC(1, sizeof(struct _slot));
     }
     rkey    = c->form(key, len);
     b->hash = h;
@@ -228,7 +229,7 @@ static VALUE locking_intern(Cache c, const char *key, size_t len) {
 }
 
 Cache cache_create(size_t size, VALUE (*form)(const char *str, size_t len), bool mark, bool locking) {
-    Cache c     = calloc(1, sizeof(struct _cache));
+    Cache c     = OJ_CALLOC(1, sizeof(struct _cache));
     int   shift = 0;
 
     for (; REHASH_LIMIT < size; size /= 2, shift++) {
@@ -243,7 +244,7 @@ Cache cache_create(size_t size, VALUE (*form)(const char *str, size_t len), bool
 #endif
     c->size    = 1 << shift;
     c->mask    = c->size - 1;
-    c->slots   = calloc(c->size, sizeof(Slot));
+    c->slots   = OJ_CALLOC(c->size, sizeof(Slot));
     c->form    = form;
     c->xrate   = 1;  // low
     c->mark    = mark;
@@ -268,11 +269,11 @@ void cache_free(Cache c) {
 
         for (s = c->slots[i]; NULL != s; s = next) {
             next = s->next;
-            free(s);
+            OJ_FREE(s);
         }
     }
-    free((void *)c->slots);
-    free(c);
+    OJ_FREE((void *)c->slots);
+    OJ_FREE(c);
 }
 
 void cache_mark(Cache c) {

data/ext/oj/cache8.c

@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mem.h"
 #include "ruby.h"
 
 #define BITS 4
@@ -32,7 +33,7 @@ void oj_cache8_new(Cache8 *cache) {
     Bucket *b;
     int     i;
 
-    *cache = ALLOC(struct _cache8);
+    *cache = OJ_R_ALLOC(struct _cache8);
     for (i = SLOT_CNT, b = (*cache)->buckets; 0 < i; i--, b++) {
         b->value = 0;
     }
@@ -51,7 +52,7 @@ static void cache8_delete(Cache8 cache, int depth) {
             }
         }
     }
-    xfree(cache);
+    OJ_R_FREE(cache);
 }
 
 slot_t oj_cache8_get(Cache8 cache, sid_t key, slot_t **slot) {

data/ext/oj/circarray.c

@@ -1,12 +1,13 @@
 // Copyright (c) 2012 Peter Ohler. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for license details.
 
+#include "mem.h"
 #include "circarray.h"
 
 CircArray oj_circ_array_new(void) {
     CircArray ca;
 
-    if (0 == (ca = ALLOC(struct _circArray))) {
+    if (0 == (ca = OJ_R_ALLOC(struct _circArray))) {
         rb_raise(rb_eNoMemError, "not enough memory\n");
     }
     ca->objs = ca->obj_array;
@@ -18,9 +19,9 @@ CircArray oj_circ_array_new(void) {
 
 void oj_circ_array_free(CircArray ca) {
     if (ca->objs != ca->obj_array) {
-        xfree(ca->objs);
+        OJ_R_FREE(ca->objs);
     }
-    xfree(ca);
+    OJ_R_FREE(ca);
 }
 
 void oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
@@ -31,12 +32,12 @@ void oj_circ_array_set(CircArray ca, VALUE obj, unsigned long id) {
             unsigned long cnt = id + 512;
 
             if (ca->objs == ca->obj_array) {
-                if (0 == (ca->objs = ALLOC_N(VALUE, cnt))) {
+                if (0 == (ca->objs = OJ_R_ALLOC_N(VALUE, cnt))) {
                     rb_raise(rb_eNoMemError, "not enough memory\n");
                 }
                 memcpy(ca->objs, ca->obj_array, sizeof(VALUE) * ca->cnt);
             } else {
-                REALLOC_N(ca->objs, VALUE, cnt);
+                OJ_R_REALLOC_N(ca->objs, VALUE, cnt);
             }
             ca->size = cnt;
         }

data/ext/oj/compat.c

@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 
+#include "mem.h"
 #include "encode.h"
 #include "err.h"
 #include "intern.h"
@@ -85,7 +86,7 @@ static void end_hash(struct _parseInfo *pi) {
             }
         }
         if (0 != parent->classname) {
-            xfree((char *)parent->classname);
+            OJ_R_FREE((char *)parent->classname);
             parent->classname = 0;
         }
     }

data/ext/oj/custom.c

@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include "mem.h"
 #include "code.h"
 #include "dump.h"
 #include "encode.h"
@@ -437,7 +438,7 @@ static void dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
                 ID    i;
 
                 if (sizeof(nbuf) <= nlen) {
-                    if (NULL == (n2 = strdup(name))) {
+                    if (NULL == (n2 = OJ_STRDUP(name))) {
                         rb_raise(rb_eNoMemError, "for attribute name.");
                     }
                 } else {
@@ -454,7 +455,7 @@ static void dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
                 i = rb_intern(n);
                 v = rb_funcall(v, i, 0);
                 if (nbuf != n2) {
-                    free(n2);
+                    OJ_FREE(n2);
                 }
             }
             fill_indent(out, d2);

data/ext/oj/dump.c

@@ -14,6 +14,7 @@
 #include <poll.h>
 #endif
 
+#include "mem.h"
 #include "cache8.h"
 #include "odd.h"
 #include "oj.h"
@@ -948,7 +949,7 @@ void oj_out_init(Out out) {
 
 void oj_out_free(Out out) {
     if (out->allocated) {
-        xfree(out->buf); // TBD
+        OJ_R_FREE(out->buf); // TBD
     }
 }
 
@@ -962,9 +963,9 @@ void oj_grow_out(Out out, size_t len) {
         size += len;
     }
     if (out->allocated) {
-        REALLOC_N(buf, char, (size + BUFFER_EXTRA));
+        OJ_R_REALLOC_N(buf, char, (size + BUFFER_EXTRA));
     } else {
-        buf            = ALLOC_N(char, (size + BUFFER_EXTRA));
+        buf            = OJ_R_ALLOC_N(char, (size + BUFFER_EXTRA));
         out->allocated = true;
         memcpy(buf, out->buf, out->end - out->buf + BUFFER_EXTRA);
     }

data/ext/oj/dump_object.c

@@ -1,6 +1,7 @@
 // Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 // Licensed under the MIT License. See LICENSE file in the project root for license details.
 
+#include "mem.h"
 #include "dump.h"
 #include "odd.h"
 #include "trace.h"
@@ -422,7 +423,7 @@ static void dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
                 ID    i;
 
                 if (sizeof(nbuf) <= nlen) {
-                    if (NULL == (n2 = strdup(name))) {
+                    if (NULL == (n2 = OJ_STRDUP(name))) {
                         rb_raise(rb_eNoMemError, "for attribute name.");
                     }
                 } else {
@@ -439,7 +440,7 @@ static void dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
                 i = rb_intern(n);
                 v = rb_funcall(v, i, 0);
                 if (nbuf != n2) {
-                    free(n2);
+                    OJ_FREE(n2);
                 }
             }
             fill_indent(out, d2);

data/ext/oj/fast.c

@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mem.h"
 #include "encode.h"
 #include "oj.h"
 #include "dump.h"
@@ -160,7 +161,7 @@ inline static Leaf leaf_new(Doc doc, int type) {
     Leaf leaf;
 
     if (0 == doc->batches || BATCH_SIZE == doc->batches->next_avail) {
-        Batch b = ALLOC(struct _batch);
+        Batch b = OJ_R_ALLOC(struct _batch);
 
         // Initializes all leaves with a NO_VAL value_type
         memset(b, 0, sizeof(struct _batch));
@@ -648,11 +649,11 @@ static void doc_free(Doc doc) {
         while (0 != (b = doc->batches)) {
             doc->batches = doc->batches->next;
             if (&doc->batch0 != b) {
-                xfree(b);
+                OJ_R_FREE(b);
             }
         }
-        xfree(doc->json);
-        xfree(doc);
+        OJ_R_FREE(doc->json);
+        OJ_R_FREE(doc);
     }
 }
 
@@ -756,7 +757,7 @@ static VALUE parse_json(VALUE clas, char *json, bool given) {
     int               ex = 0;
     volatile VALUE    self;
 
-    doc = RB_ALLOC_N(struct _doc, 1);
+    doc = OJ_R_ALLOC_N(struct _doc, 1);
 
     // skip UTF-8 BOM if present
     if (0xEF == (uint8_t)*json && 0xBB == (uint8_t)json[1] && 0xBF == (uint8_t)json[2]) {
@@ -793,7 +794,7 @@ static VALUE parse_json(VALUE clas, char *json, bool given) {
         /*
         doc_free(pi.doc);
         if (0 != ex) {  // will jump so caller will not free
-            xfree(json);
+            OJ_R_FREE(json);
         }
         */
     } else {
@@ -1092,14 +1093,14 @@ static VALUE doc_open(VALUE clas, VALUE str) {
 
     Check_Type(str, T_STRING);
     len      = (int)RSTRING_LEN(str) + 1;
-    json     = RB_ALLOC_N(char, len);
+    json     = OJ_R_ALLOC_N(char, len);
 
     memcpy(json, StringValuePtr(str), len);
     obj = parse_json(clas, json, given);
     // TBD is this needed
     /*
     if (given) {
-        xfree(json);
+        OJ_R_FREE(json);
     }
     */
     return obj;
@@ -1139,7 +1140,7 @@ static VALUE doc_open_file(VALUE clas, VALUE filename) {
     }
     fseek(f, 0, SEEK_END);
     len      = ftell(f);
-    json = RB_ALLOC_N(char, len + 1);
+    json = OJ_R_ALLOC_N(char, len + 1);
 
     fseek(f, 0, SEEK_SET);
     if (len != fread(json, 1, len, f)) {
@@ -1155,7 +1156,7 @@ static VALUE doc_open_file(VALUE clas, VALUE filename) {
     // TBD is this needed
     /*
     if (given) {
-        xfree(json);
+        OJ_R_FREE(json);
     }
     */
     return obj;

data/ext/oj/intern.c

@@ -8,6 +8,8 @@
 #if HAVE_PTHREAD_MUTEX_INIT
 #include <pthread.h>
 #endif
+
+#include "mem.h"
 #include "cache.h"
 #include "parse.h"
 
@@ -55,7 +57,7 @@ static VALUE form_attr(const char *str, size_t len) {
     char buf[256];
 
     if (sizeof(buf) - 2 <= len) {
-        char *b = ALLOC_N(char, len + 2);
+        char *b = OJ_R_ALLOC_N(char, len + 2);
         ID    id;
 
         if ('~' == *str) {
@@ -68,7 +70,7 @@ static VALUE form_attr(const char *str, size_t len) {
 	    b[len + 1] = '\0';
 	}
         id = rb_intern3(buf, len + 1, oj_utf8_encoding);
-        xfree(b);
+        OJ_R_FREE(b);
         return id;
     }
     if ('~' == *str) {
@@ -246,7 +248,7 @@ VALUE oj_class_intern(const char *key, size_t len, bool safe, ParseInfo pi, int
                 }
                 bucket = b;
             }
-            b            = ALLOC(struct _keyVal);
+            b            = OJ_R_ALLOC(struct _keyVal);
             b->next      = NULL;
             bucket->next = b;
             bucket       = b;
@@ -267,7 +269,7 @@ VALUE oj_class_intern(const char *key, size_t len, bool safe, ParseInfo pi, int
                 }
                 bucket = b;
             }
-            b            = ALLOC(struct _keyVal);
+            b            = OJ_R_ALLOC(struct _keyVal);
             b->next      = NULL;
             bucket->next = b;
             bucket       = b;
@@ -281,7 +283,7 @@ VALUE oj_class_intern(const char *key, size_t len, bool safe, ParseInfo pi, int
 }
 
 char *oj_strndup(const char *s, size_t len) {
-    char *d = ALLOC_N(char, len + 1);
+    char *d = OJ_R_ALLOC_N(char, len + 1);
 
     memcpy(d, s, len);
     d[len] = '\0';