oj 3.16.15 → 3.16.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6db05b46e3837d071f397a773cd17b020138ea743f34e02b9e0c58a9ccaaa06
-  data.tar.gz: 59aaf6e0cb240c731d0e99728da5bad38fff64b3cfb657e80134775223d5eb67
+  metadata.gz: 07c7a6ebc6baf4f02b93760ed3d7440cdc9b2af85d0976e525f34978ab823c45
+  data.tar.gz: ed5a5a2e16f8df836a098de0da60657688049cfcf820d3142b4122302ae4e946
 SHA512:
-  metadata.gz: db4b3a628e201db37bccd68d896aeb42317d0f830767e6ef4700cbc4176419febe2a5c4306ff420b9488c85fa6981638e353d12a1b18bd5c77407c95d654b629
-  data.tar.gz: 857bd59915a1c1486c93ba79cc0fa078b98ba6a73e7924bf4424f901a41aab50c55ef8b0e28dbcb51f52b02b4400959471d91d010cb2937838683a594d987e24
+  metadata.gz: d8f5c73fbc30a2985c2352e466f8ef9762f831d15b9c0a8b9394d66a5613910fd5aca4c4bdc49c40230128d791244ad67f6f9852c4778e89828a4358bb997c11
+  data.tar.gz: dbc5fe50d1ad89cb23918c950ac849052a95defb7e5509d7653236eb3569c811685e2c4c6546a8ab38c5a346aad0ccdd9770c855bc53f96c0c5312c7d61fab3e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.16.16 - 2026-03-13
+
+- Not closed arrays and objects are reported corrected in the usual parser.
+
 ## 3.16.15 - 2026-02-05
 
 - Fixed by putting the ostruct dependency back until a better way is found to conditionally include it.

data/ext/oj/dump.c

@@ -206,7 +206,7 @@ void initialize_neon(void) {
 static __m128i hibit_friendly_chars_sse42[8];
 
 // From: https://stackoverflow.com/questions/36998538/fastest-way-to-horizontally-sum-sse-unsigned-byte-vector
-inline uint32_t _mm_sum_epu8(const __m128i v) {
+inline static OJ_TARGET_SSE42 uint32_t _mm_sum_epu8(const __m128i v) {
     __m128i vsum = _mm_sad_epu8(v, _mm_setzero_si128());
     return _mm_cvtsi128_si32(vsum) + _mm_extract_epi16(vsum, 4);
 }

data/ext/oj/parse.c

@@ -199,6 +199,31 @@ static inline const char *scan_string_noSIMD(const char *str, const char *end) {
     return str;
 }
 
+#ifdef HAVE_SIMD_NEON
+
+static inline const char *string_scan_neon(const char *str, const char *end) {
+    const uint8x16_t null_char = vdupq_n_u8(0);
+    const uint8x16_t backslash = vdupq_n_u8('\\');
+    const uint8x16_t quote     = vdupq_n_u8('"');
+
+    while (str + sizeof(uint8x16_t) <= end) {
+        uint8x16_t      chunk = vld1q_u8((const uint8_t *)str);
+        uint8x16_t      tmp   = vorrq_u8(vorrq_u8(vceqq_u8(chunk, null_char), vceqq_u8(chunk, backslash)),
+                                  vceqq_u8(chunk, quote));
+        const uint8x8_t res   = vshrn_n_u16(vreinterpretq_u16_u8(tmp), 4);
+        uint64_t        mask  = vget_lane_u64(vreinterpret_u64_u8(res), 0);
+        if (mask != 0) {
+            mask &= 0x8888888888888888ull;
+            return str + (OJ_CTZ64(mask) >> 2);
+        }
+        str += sizeof(uint8x16_t);
+    }
+
+    return scan_string_noSIMD(str, end);
+}
+
+#endif
+
 #ifdef HAVE_SIMD_SSE4_2
 // Optimized SIMD string scanner using SSE4.2 instructions
 // Uses prefetching and processes multiple chunks in parallel to reduce latency
@@ -357,10 +382,12 @@ void oj_scanner_init(void) {
 #endif
 #ifdef HAVE_SIMD_SSE2
     case SIMD_SSE2: scan_func = scan_string_SSE2; break;
+#endif
+#ifdef HAVE_SIMD_NEON
+    case SIMD_NEON: scan_func = string_scan_neon; break;
 #endif
     default: scan_func = scan_string_noSIMD; break;
     }
-    // Note: ARM NEON string scanning would be added here if needed
 }
 
 // entered at /

data/ext/oj/parser.c

@@ -1371,6 +1371,13 @@ static VALUE parser_parse(VALUE self, VALUE json) {
     p->start(p);
     parse(p, ptr);
 
+    if (0 < p->depth) {
+        if (OBJECT_FUN == p->stack[p->depth]) {
+            parse_error(p, "Object is not closed");
+        } else {
+            parse_error(p, "Array is not closed");
+        }
+    }
     return p->result(p);
 }
 

data/ext/oj/simd.h

@@ -40,14 +40,26 @@ SIMD_Implementation oj_get_simd_implementation(void);
 // Count trailing zeros (for SSE2 mask scanning)
 #if defined(__GNUC__) || defined(__clang__)
 #define OJ_CTZ(x) __builtin_ctz(x)
+#define OJ_CTZ64(x) __builtin_ctzll(x)
 #elif defined(_MSC_VER)
 #include <intrin.h>
 static __inline int oj_ctz_msvc(unsigned int x) {
     unsigned long index;
+    if (0 == x) {
+        return 32;
+    }
     _BitScanForward(&index, x);
     return (int)index;
 }
+static __inline int oj_ctz64_msvc(uint64_t x) {
+    unsigned long index;
+    if (_BitScanForward64(&index, x)) {
+        return (int)index;
+    }
+    return 64;
+}
 #define OJ_CTZ(x) oj_ctz_msvc(x)
+#define OJ_CTZ64(x) oj_ctz64_msvc(x)
 #else
 // Fallback: naive implementation
 static inline int oj_ctz_fallback(unsigned int x) {
@@ -58,7 +70,17 @@ static inline int oj_ctz_fallback(unsigned int x) {
     }
     return count;
 }
+
+static inline int oj_ctz64_fallback(uint64_t x) {
+    int count = 0;
+    while ((x & 1) == 0 && count < 64) {
+        x >>= 1;
+        count++;
+    }
+    return count;
+}
 #define OJ_CTZ(x) oj_ctz_fallback(x)
+#define OJ_CTZ64(x) oj_ctz64_fallback(x)
 #endif
 
 // =============================================================================

data/lib/oj/version.rb

@@ -1,4 +1,4 @@
 module Oj
   # Current version of the module.
-  VERSION = '3.16.15'
+  VERSION = '3.16.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.16.15
+  version: 3.16.16
 platform: ruby
 authors:
 - Peter Ohler