yeptris 0.6.31.2-aarch64-linux → 0.6.33.1-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 183da7797c7f5b350cd690df5ce9d68192e876b67d9d894d86e699fd525f893a
-  data.tar.gz: b650b33d6927a1ebb0659925eac2fadf73bd7a55bf87a7c3b5acf140a1463209
+  metadata.gz: aa8d3b78ec99584df719ea52b83de134ccec4b1c5c00dabbfd54e2850c2789c5
+  data.tar.gz: f259f9122e64be66be515aa9e41a8bf8d74bec2aeaf4f6a6f9855ed416c899b4
 SHA512:
-  metadata.gz: c215e725c05e52335ac398ce44bf5a28f33456e7941da00bc4349f6a0715629fe14f87cfe7e558e00ca6c0406253677d9a1fff5bc03dab95ae2591dc88b3d72d
-  data.tar.gz: 30307baad810806be2ba5007d544d1f1de11151d38f21a93dd040289bb6dbb392b242fd6897c30c9b8cd37b67fa43343c698513c4fc22e4d3790151d85dc311c
+  metadata.gz: 5bf5c78083f143525812c7d41ec69b515a9836f0f061e6a621c1b4f7a63a6d89e54eccf11cdda6c9cbc35943637d946cf39a2f06126d19e97acbe6495a1fe6fc
+  data.tar.gz: 2ff20e717f4351f3b74305464ceb7deab18442090748d5d79504574639df0ef9ee42149b426e813ca683daf2bec620472f3791b194820e8888ad004209da0709

data/lib/yeptris/node.rb

@@ -50,7 +50,7 @@ class Yeptris::Node
 
   # Scalar content / alias name (UTF-8 String), nil for collections.
   def value
-    len = ::FFI::MemoryPointer.new(:size_t)
+    len = len_buffer
     ptr = alive { Yeptris::FFI.yeptris_node_value(@c_ptr, len) }
     return nil if ptr.null?
 
@@ -69,9 +69,18 @@ class Yeptris::Node
     STYLES[alive { Yeptris::FFI.yeptris_node_style(@c_ptr) }]
   end
 
+  # The out-length receiver: ONE buffer per thread, reused. A fresh
+  # FFI::MemoryPointer per accessor call was an allocation storm that
+  # stalled the Windows heap under the #182 churn loop (the #504
+  # family — the hang's stack sits in FFI::MemoryPointer#initialize,
+  # node.rb anchor/tag reads inside Integer#times with GC.start).
+  def len_buffer
+    Thread.current[:yeptris_len_buf] ||= ::FFI::MemoryPointer.new(:size_t)
+  end
+
   # Explicit tag URI when present, else nil.
   def tag
-    len = ::FFI::MemoryPointer.new(:size_t)
+    len = len_buffer
     ptr = alive { Yeptris::FFI.yeptris_node_tag(@c_ptr, len) }
     return nil if ptr.null?
 
@@ -79,7 +88,7 @@ class Yeptris::Node
   end
 
   def anchor
-    len = ::FFI::MemoryPointer.new(:size_t)
+    len = len_buffer
     ptr = alive { Yeptris::FFI.yeptris_node_anchor(@c_ptr, len) }
     return nil if ptr.null?
 

data/lib/yeptris/psych/visitors.rb

@@ -216,7 +216,7 @@ module Yeptris
               # explicit !!str tag (single-quoted) so it does not
               # re-load as a merge
               key_node = @tree.new_scalar("<<", :single_quoted)
-              key_node.set_tag("!!str")
+              key_node.set_tag("tag:yaml.org,2002:str")
               m.map_add_node(key_node, visit(v))
             else
               m.map_add(key_text(k), visit(v))

data/lib/yeptris/yaml.rb

@@ -364,7 +364,7 @@ module Yeptris
               # stdlib yaml_tree: a literal chevron key carries the
               # explicit !!str tag so it does not re-load as a merge
               key_node = doc.new_scalar("<<", :single_quoted)
-              key_node.set_tag("!!str")
+              key_node.set_tag("tag:yaml.org,2002:str")
               m.map_add_node(key_node, build(doc, v, seen))
             else
               m.map_add(key_text(k), build(doc, v, seen))

data/lib/yeptris.rb

@@ -3,7 +3,7 @@
 module Yeptris
   # The gem's version lives in the parent namespace's file — the last
   # internal require (yeptris/version) retired with it.
-  VERSION = "0.6.31.2".freeze
+  VERSION = "0.6.33.1".freeze
 
   # Informational notices are OPT-IN (yeptris-ruby#217): consumers
   # embed yeptris inside CLIs that assert clean stderr, and a

data/vendor/libyeptris/CMakeLists.txt

@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(yeptris
-    VERSION 0.6.31
+    VERSION 0.6.33
     DESCRIPTION "Ultra-fast YAML 1.2 parser, emitter and streamer in C"
     LANGUAGES C CXX
 )
@@ -98,15 +98,27 @@ if(YEPTRIS_ENABLE_UBSAN)
     message(STATUS "UndefinedBehaviorSanitizer: ENABLED (fatal)")
 endif()
 
-# libFuzzer implies ASAN (libleptris TODO 40 pattern).
+# libFuzzer implies ASAN+UBSan (the teptris fuzz.yml pattern: the
+# memory-safety contracts ride the SAME binary as the fuzzer, so every
+# nightly round reports UB at the crash site instead of libFuzzer's
+# "combine with AddressSanitizer" note).
 if(YEPTRIS_ENABLE_FUZZING)
     # instrument everything, but link the fuzzer MAIN only into the
     # harnesses: a global -fsanitize=fuzzer link option demands
     # LLVMFuzzerTestOneInput from every executable (the CLI and the
     # test binaries died on it once CXX also pinned to clang++)
-    add_compile_options(-fsanitize=fuzzer-no-link,address -fno-omit-frame-pointer -g)
-    add_link_options(-fsanitize=address)
-    message(STATUS "libFuzzer: ENABLED (implies ASAN)")
+    if(APPLE)
+        # Apple ld64 cannot link UBSan'd static archives
+        # ("invalid r_symbolnum"): ASan-only locally
+        add_compile_options(-fsanitize=fuzzer-no-link,address -fno-omit-frame-pointer -g)
+        add_link_options(-fsanitize=address)
+        message(STATUS "libFuzzer: ENABLED (implies ASAN; UBSan needs linux ld)")
+    else()
+        add_compile_options(-fsanitize=fuzzer-no-link,address,undefined
+            -fno-sanitize-recover=undefined -fno-omit-frame-pointer -g)
+        add_link_options(-fsanitize=address,undefined)
+        message(STATUS "libFuzzer: ENABLED (implies ASAN+UBSan)")
+    endif()
 endif()
 
 # -------------------------------------------------------------------- LTO --

data/vendor/libyeptris/src/yeptris/dom/dom.c

@@ -392,6 +392,27 @@ int yep_dom_on_event(void* ctx, const yep_event* ev) {
         if (d->depth == 0) {
             return -1;
         }
+        if (ev->type == YEP_EV_MAP_END && d->map_pending_key[d->depth - 1]) {
+            /* an odd child reached the mapping: the unpaired node —
+             * possibly an ANCHORED one — used to be dropped here, its
+             * anchor lost, and a later alias then emitted a dangling
+             * reference the re-parse rejected (the nightly's round
+             * 102). Pair it with a null: "k:" with nothing is a null
+             * value in every other position. */
+            yep_event nv;
+            memset(&nv, 0, sizeof(nv));
+            nv.type = YEP_EV_SCALAR;
+            nv.style = YEP_STYLE_PLAIN;
+            nv.implicit = 1;
+            uint32_t nid = dom_new_node(d, &nv, YEP_DOM_SCALAR);
+            if (nid == UINT32_MAX) {
+                return -1;
+            }
+            uint32_t top = d->stack[d->depth - 1];
+            dom_link(d, top, d->pending_key_id[d->depth - 1]);
+            dom_link(d, top, nid);
+            d->map_pending_key[d->depth - 1] = 0;
+        }
         d->depth--;
         return 0;
 
@@ -729,6 +750,7 @@ static int jb_value(jbuilder* b) {
             return 0;
         }
         for (;;) {
+            size_t member_start = b->i;
             int rc = jb_value(b);
             if (rc != 0) {
                 return rc;
@@ -738,6 +760,14 @@ static int jb_value(jbuilder* b) {
                 /* a value must be followed by , or } — the map's key
                  * slot is pending until the ':' value completes */
                 if (b->i < b->len && b->p[b->i] == ':' && d->map_pending_key[d->depth - 1] != 0) {
+                    /* libyaml's simple-key law rides the JSON-class
+                     * route too: a key whose colon distance crosses
+                     * 1024 characters defers to the engine's clean
+                     * error (run 38143486175) */
+                    if (b->i - member_start > 1024 &&
+                        yep_simple_key_chars(b->p + member_start, b->i - member_start) > 1024) {
+                        return -2;
+                    }
                     b->i++;
                     rc = jb_value(b);
                     if (rc != 0) {
@@ -820,8 +850,11 @@ int dom_on_flow_build(void* ctx, const char* p, size_t open, size_t len, uint32_
     yep_json_walk w;
     yep_json_tok t;
     yep_json_walk_init(&w, p, len, open, max_depth);
-    w.strict = d->flow_strict; /* the strict-JSON route rides the same
-                                  fused walk (TODO.restructure/81) */
+    w.strict = 1; /* the same byte-for-byte JSON gate as the engine's
+                   * pass 1: a lenient walk split number/literal keys
+                   * across the fast/slow paths (whole {9->1} vs chunked
+                   * {"9:1"->null}); flow_strict keeps owning the TAG
+                   * route only (TODO.restructure/81) */
     for (;;) {
         yep_jw_status st = yep_json_walk_next(&w, &t);
         if (st == YEP_JW_REJECT) {
@@ -976,6 +1009,23 @@ int dom_from_tape(yep_dom* d, const yeptris_json_tape* t) {
             if (d->depth == 0) {
                 return -1;
             }
+            if (d->nodes[d->stack[d->depth - 1]].kind == YEP_DOM_MAPPING &&
+                d->map_pending_key[d->depth - 1]) {
+                /* an odd child reached the mapping (see the event-path
+                 * MAP_END): pair it with a null instead of dropping it */
+                yep_event nv;
+                memset(&nv, 0, sizeof(nv));
+                nv.type = YEP_EV_SCALAR;
+                nv.style = YEP_STYLE_PLAIN;
+                nv.implicit = 1;
+                uint32_t nid = dom_new_node(d, &nv, YEP_DOM_SCALAR);
+                if (nid == UINT32_MAX) {
+                    return -1;
+                }
+                dom_link(d, d->stack[d->depth - 1], d->pending_key_id[d->depth - 1]);
+                dom_link(d, d->stack[d->depth - 1], nid);
+                d->map_pending_key[d->depth - 1] = 0;
+            }
             d->depth--;
             break;
         case YEP_T_NULL: