oj 3.13.23 → 3.16.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2f8a01b7a59da7cd25ed3551065dddd9e31e5184989804d172c2e39cc769d6
-  data.tar.gz: 7211a96856ec44173fa9dcc7245e3cb2f6b7c2e22a746ef35f168126873f4c88
+  metadata.gz: d3e57c02a1fe6782596953f34b8e2a2b729a09b5d8e7128dd4633d430ca7aa0c
+  data.tar.gz: 7698f8c0203459d62f4421f11a9c3637b04b5b808ecf87ce4ca057e2fd073762
 SHA512:
-  metadata.gz: ee3ad5cac6cac48bcf7fdf682e69770dfee08b502735cc75b84ae1635196fdcdaf2fde021e32e6d897bdc6935e111882ddc48fa5a274fe0d98ad45c2fdf68917
-  data.tar.gz: 3e05212fa84a2bf05954ec870ac27da7c845335b411507aa0bf5e45497403cccf4c40990f0ee8cee6d21f19163f33116bb240836795482737eaa744bc5ff6d94
+  metadata.gz: 417ada5b645a6ba48e81b52bb72cec97bb4a64595a61252989346a975c1026b3cbc039cbf7cef166b5dbfbdd79554d5c9e5786da3299ce1fd3f2ec70d3ef479f
+  data.tar.gz: ceffb29c6732b107d42091bc8754e8b4174e26e6d8eb9c4162ed8a12a65d37aa2450f9f5398d39242d92fabd46d63be5fc14e0dc003774378e4e6211b02e3f0d

data/CHANGELOG.md

@@ -1,5 +1,86 @@
 # CHANGELOG
 
+## 3.16.9 - 2024-12-28
+
+- Fixed `Oj::Parser` create_id size issue #931.
+
+- Changed parser to be more optimized (PR from @Watson1978)
+
+## 3.16.8 - 2024-12-14
+
+- Fixed StreamWriter to write to non-file IO thanks to @jscheid.
+
+## 3.16.7 - 2024-11-01
+
+- Changed string_writer_as_json to allow multiple arguments.
+
+- Fixed Global variable registration added to mimic_json and rails code thanks to @byroot.
+
+## 3.16.6 - 2024-09-09
+
+- Fixed issue with Rails 7.2 that changed the order of calls to to_json and as_json.
+
+## 3.16.5 - 2024-08-07
+
+- Fixed Oj::Parser so that block procedures work correctly.
+
+## 3.16.4 - 2024-06-08
+
+- Fixed Oj::Parse EOF issue on larger stream input.
+
+## 3.16.3 - 2023-12-11
+
+- Fixed the gemspec to allow earlier versions of the bigdecimal gem.
+
+## 3.16.2 - 2023-12-06
+
+- Fixed documentation formatting.
+
+- Added option to the "usual" parser to raise an error on an empty input string.
+
+## 3.16.1 - 2023-09-01
+
+- Fixed exception type on number parsing. (thank you @jasonpenny)
+
+## 3.16.0 - 2023-08-16
+
+- Added the `float_format` option.
+
+- Expanded the `max_nesting` option to allow integer values as well as
+  the previous boolean (true or nil).
+
+- Skip nesting tests with Truffle Ruby in the json gem tests.
+
+## 3.15.1 - 2023-07-30
+
+- Add protection against some using `require 'oj/json`, an internal file.
+
+- Fixed non-json errors when in compat mode.
+
+## 3.15.0 - 2023-06-02
+
+- Added `omit_null_byte` option when dumping.
+
+## 3.14.3 - 2023-04-07
+
+- Fixed compat parse with optimized Hash when parsing a JSON::GenericObject.
+
+## 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.
+
+- Fixed hang on unterminated string with a \0 byte in parse.c.
+
+## 3.14.0 - 2023-01-30
+
+- Tracing is now a compile time option giving a 15 to 20% performance boost.
+
+- Some cleanup in the fast parser.
+
 ## 3.13.23 - 2022-11-06
 
 - Fixed issue with Oj::Parser extension regarding GC timeing.

data/README.md

@@ -1,9 +1,8 @@
 # [![{}j](http://www.ohler.com/dev/images/oj_comet_64.svg)](http://www.ohler.com/oj) gem
 
-[![Build Status](https://img.shields.io/github/workflow/status/ohler55/oj/CI?logo=github)](https://github.com/ohler55/oj/actions/workflows/CI.yml)
+[![CI](https://github.com/ohler55/oj/actions/workflows/CI.yml/badge.svg)](https://github.com/ohler55/oj/actions/workflows/CI.yml)
 ![Gem](https://img.shields.io/gem/v/oj.svg)
 ![Gem](https://img.shields.io/gem/dt/oj.svg)
-[![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=oj&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=oj&package-manager=bundler&version-scheme=semver)
 [![TideLift](https://tidelift.com/badges/github/ohler55/oj)](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
 
 A *fast* JSON parser and Object marshaller as a Ruby gem.
@@ -70,6 +69,7 @@ links.
  - [{file:Compatibility.md}](pages/Compatibility.md) lists current compatibility with Rubys and Rails.
  - [{file:Advanced.md}](pages/Advanced.md) for fast parser and marshalling features.
  - [{file:Security.md}](pages/Security.md) for security considerations.
+ - [{file:InstallOptions.md}](pages/InstallOptions.md) for install option.
 
 ## Releases
 

data/ext/oj/buf.h

@@ -4,6 +4,7 @@
 #ifndef OJ_BUF_H
 #define OJ_BUF_H
 
+#include "mem.h"
 #include "ruby.h"
 
 typedef struct _buf {
@@ -11,7 +12,7 @@ typedef struct _buf {
     char *end;
     char *tail;
     char  base[1024];
-} * Buf;
+} *Buf;
 
 inline static void buf_init(Buf buf) {
     buf->head = buf->base;
@@ -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

@@ -7,6 +7,7 @@
 #include <stdlib.h>
 
 #include "cache.h"
+#include "mem.h"
 
 // The stdlib calloc, realloc, and free are used instead of the Ruby ALLOC,
 // ALLOC_N, REALLOC, and xfree since the later could trigger a GC which will
@@ -28,16 +29,16 @@
 #define M 0x5bd1e995
 
 typedef struct _slot {
-    struct _slot *    next;
+    struct _slot     *next;
     VALUE             val;
     uint64_t          hash;
     volatile uint32_t use_cnt;
     uint8_t           klen;
     char              key[CACHE_MAX_KEY];
-} * Slot;
+} *Slot;
 
 typedef struct _cache {
-    volatile Slot * slots;
+    volatile Slot  *slots;
     volatile size_t cnt;
     VALUE (*form)(const char *str, size_t len);
     uint64_t size;
@@ -52,7 +53,7 @@ typedef struct _cache {
 #endif
     uint8_t xrate;
     bool    mark;
-} * Cache;
+} *Cache;
 
 void cache_set_form(Cache c, VALUE (*form)(const char *str, size_t len)) {
     c->form = form;
@@ -94,13 +95,13 @@ static uint64_t hash_calc(const uint8_t *key, size_t len) {
 
 static void rehash(Cache c) {
     uint64_t osize;
-    Slot *   end;
-    Slot *   sp;
+    Slot    *end;
+    Slot    *sp;
 
     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++) {
@@ -110,7 +111,7 @@ static void rehash(Cache c) {
         *sp = NULL;
         for (; NULL != s; s = next) {
             uint64_t h      = s->hash & c->mask;
-            Slot *   bucket = (Slot *)c->slots + h;
+            Slot    *bucket = (Slot *)c->slots + h;
 
             next    = s->next;
             s->next = *bucket;
@@ -121,14 +122,14 @@ static void rehash(Cache c) {
 
 static VALUE lockless_intern(Cache c, const char *key, size_t len) {
     uint64_t       h      = hash_calc((const uint8_t *)key, len);
-    Slot *         bucket = (Slot *)c->slots + (h & c->mask);
+    Slot          *bucket = (Slot *)c->slots + (h & c->mask);
     Slot           b;
     volatile VALUE rkey;
 
     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--;
@@ -165,7 +166,7 @@ static VALUE lockless_intern(Cache c, const char *key, size_t len) {
 
 static VALUE locking_intern(Cache c, const char *key, size_t len) {
     uint64_t       h;
-    Slot *         bucket;
+    Slot          *bucket;
     Slot           b;
     uint64_t       old_size;
     volatile VALUE rkey;
@@ -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++) {
@@ -241,12 +242,12 @@ Cache cache_create(size_t size, VALUE (*form)(const char *str, size_t len), bool
 #else
     c->mutex = rb_mutex_new();
 #endif
-    c->size    = 1 << shift;
-    c->mask    = c->size - 1;
-    c->slots   = calloc(c->size, sizeof(Slot));
-    c->form    = form;
-    c->xrate   = 1;  // low
-    c->mark    = mark;
+    c->size  = 1 << shift;
+    c->mask  = c->size - 1;
+    c->slots = OJ_CALLOC(c->size, sizeof(Slot));
+    c->form  = form;
+    c->xrate = 1;  // low
+    c->mark  = mark;
     if (locking) {
         c->intern = locking_intern;
     } else {
@@ -259,7 +260,8 @@ void cache_set_expunge_rate(Cache c, int rate) {
     c->xrate = (uint8_t)rate;
 }
 
-void cache_free(Cache c) {
+void cache_free(void *data) {
+    Cache    c = (Cache)data;
     uint64_t i;
 
     for (i = 0; i < c->size; i++) {
@@ -268,14 +270,15 @@ 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) {
+void cache_mark(void *data) {
+    Cache    c = (Cache)data;
     uint64_t i;
 
 #if !HAVE_PTHREAD_MUTEX_INIT

data/ext/oj/cache.h

@@ -10,10 +10,11 @@
 #define CACHE_MAX_KEY 35
 
 struct _cache;
+typedef struct _cache *Cache;
 
 extern struct _cache *cache_create(size_t size, VALUE (*form)(const char *str, size_t len), bool mark, bool locking);
-extern void           cache_free(struct _cache *c);
-extern void           cache_mark(struct _cache *c);
+extern void           cache_free(void *data);
+extern void           cache_mark(void *data);
 extern void           cache_set_form(struct _cache *c, VALUE (*form)(const char *str, size_t len));
 extern VALUE          cache_intern(struct _cache *c, const char *key, size_t len);
 extern void           cache_set_expunge_rate(struct _cache *c, int rate);

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,16 +33,18 @@ 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;
     }
 }
 
-void oj_cache8_delete(Cache8 cache) { cache8_delete(cache, 0); }
+void oj_cache8_delete(Cache8 cache) {
+    cache8_delete(cache, 0);
+}
 
 static void cache8_delete(Cache8 cache, int depth) {
-    Bucket *     b;
+    Bucket      *b;
     unsigned int i;
 
     for (i = 0, b = cache->buckets; i < SLOT_CNT; i++, b++) {
@@ -51,7 +54,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) {
@@ -79,7 +82,7 @@ void oj_cache8_print(Cache8 cache) {
 }
 
 static void slot_print(Cache8 c, sid_t key, unsigned int depth) {
-    Bucket *     b;
+    Bucket      *b;
     unsigned int i;
     sid_t        k8 = (sid_t)key;
     sid_t        k;
@@ -90,11 +93,9 @@ static void slot_print(Cache8 c, sid_t key, unsigned int depth) {
             /*printf("*** key: 0x%016llx  depth: %u  i: %u\n", k, depth, i); */
             if (DEPTH - 1 == depth) {
 #if IS_WINDOWS
-                printf("0x%016lx: %4lu\n", (long unsigned int)k,
-                       (long unsigned int)b->value);
+                printf("0x%016lx: %4lu\n", (long unsigned int)k, (long unsigned int)b->value);
 #else
-                printf("0x%016llx: %4llu\n", (long long unsigned int)k,
-                       (long long unsigned int)b->value);
+                printf("0x%016llx: %4llu\n", (long long unsigned int)k, (long long unsigned int)b->value);
 #endif
             } else {
                 slot_print(b->child, k, depth + 1);

data/ext/oj/circarray.c

@@ -3,10 +3,12 @@
 
 #include "circarray.h"
 
+#include "mem.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 +20,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 +33,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/circarray.h

@@ -9,10 +9,10 @@
 
 typedef struct _circArray {
     VALUE         obj_array[1024];
-    VALUE *       objs;
+    VALUE*        objs;
     unsigned long size;  // allocated size or initial array size
     unsigned long cnt;
-} * CircArray;
+}* CircArray;
 
 extern CircArray oj_circ_array_new(void);
 extern void      oj_circ_array_free(CircArray ca);

data/ext/oj/code.c

@@ -18,8 +18,8 @@ inline static VALUE resolve_classname(VALUE mod, const char *classname) {
 static VALUE path2class(const char *name) {
     char        class_name[1024];
     VALUE       clas;
-    char *      end = class_name + sizeof(class_name) - 1;
-    char *      s;
+    char       *end = class_name + sizeof(class_name) - 1;
+    char       *s;
     const char *n = name;
 
     clas = rb_cObject;
@@ -185,24 +185,17 @@ void oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out, bool with_class) {
             } else {
                 char   buf[32];
                 char  *b   = buf + sizeof(buf) - 1;
-                int    neg = 0;
+                bool   neg = false;
                 long   num = attrs->num;
                 size_t cnt = 0;
 
                 if (0 > num) {
-                    neg = 1;
+                    neg = true;
                     num = -num;
                 }
                 *b-- = '\0';
                 if (0 < num) {
-                    for (; 0 < num; num /= 10, b--) {
-                        *b = (num % 10) + '0';
-                    }
-                    if (neg) {
-                        *b = '-';
-                    } else {
-                        b++;
-                    }
+                    b = oj_longlong_to_string(num, neg, b);
                 } else {
                     *b = '0';
                 }

data/ext/oj/code.h

@@ -17,7 +17,7 @@ typedef struct _code {
     EncodeFunc  encode;
     DecodeFunc  decode;
     bool        active;  // For compat mode.
-} * Code;
+} *Code;
 
 // Used by encode functions.
 typedef struct _attr {
@@ -26,7 +26,7 @@ typedef struct _attr {
     VALUE       value;
     long        num;
     VALUE       time;
-} * Attr;
+} *Attr;
 
 extern bool  oj_code_dump(Code codes, VALUE obj, int depth, Out out);
 extern VALUE oj_code_load(Code codes, VALUE clas, VALUE args);