yeptris 0.6.7.5 → 0.6.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a084064bffdbce7ccb0461e1402e7a91331e530e71b9ad31967d82e6e5b751db
-  data.tar.gz: 0e8c5b97a1e09ef1f3bc4672806b777d68260075536370eedc8b628513f439f8
+  metadata.gz: e3cd35014222c85dc46a7d9cc3622ae85729d055a218ab89899aaee638d774bb
+  data.tar.gz: abab0a3805fad843a6c1ac6e6f09e28e5cd0c3874f6e58e1cc3bf86dbdbaec9b
 SHA512:
-  metadata.gz: 9791fdedd1c2afc3588abb612a8b98bd8ae57f065aea74db052b49f46025dfa52c40acb60a2aebb12acb41a5d464a957185d4ee62e0a07b38e069fcc94d431b2
-  data.tar.gz: 6e3931a4cd862b8e8061d9b0c999f73113e0f62e11952ae630abbfd42cbfd76dd3f935a52990ee94a646c319e391b24f379398b940a3ca3fc101084fa31fda9c
+  metadata.gz: 2af308efb9fc6d825adc204d950ed2c2496fcaad50194015711c6d89dec0c4c32a7630e5644c0edc1df880fa684311d1aa7ddabfb7572e05a9d28d7ae81df1fb
+  data.tar.gz: 3ce1d7a886d39e9afafacd94f0869152b0d21cacb548ce49b76b929c7a705163ce8dc996e636a40541d7e334d4a3aa49a0ee3a79488dac55477ebdb570f76303

data/lib/yeptris/cbor.rb

@@ -41,17 +41,26 @@ module Yeptris
       raise Error, "libyeptris has no CBOR support" unless available?
 
       items = []
+      pending_error = nil
       receiver = ::FFI::Function.new(:int, %i[pointer pointer size_t]) do |_ctx, item, _index|
         # the callback owns the item; materialize then free in place
-        # (through the wrapper — the finalizer frees too)
-        doc = ::Yeptris::Document.new(item)
-        items << doc.root&.to_ruby
-        doc.free
-        0
+        # (through the wrapper — the finalizer frees too). A raise
+        # inside an FFI callback leaves the return value undefined —
+        # abort the C iteration cleanly (nonzero) and re-raise after
+        begin
+          doc = ::Yeptris::Document.new(item)
+          items << doc.root&.to_ruby
+          doc.free
+          0
+        rescue ::Exception => e # rubocop:disable Lint/RescueException
+          pending_error = e
+          1
+        end
       end
       st = ::Yeptris::FFI.yeptris_cbor_decode_sequence(
         data, data.bytesize, strict ? STRICT : 0, receiver, nil, nil
       )
+      raise pending_error if pending_error
       raise ParseError, ::Yeptris::FFI.last_error_message if st.zero? && !data.empty?
 
       items

data/lib/yeptris/psych/drop_in.rb

@@ -21,3 +21,22 @@ end
 # rebind is this file's whole purpose
 Object.class_eval { remove_const(:Psych) } if defined?(::Psych) && !::Psych.equal?(Yeptris::Psych)
 ::Psych = Yeptris::Psych
+
+# yaml-first boot order: ::YAML still references the ORIGINAL stdlib
+# module object, whose singleton methods route through stdlib's parse
+# stream — the UTF-8 tagging (and every other normalization) never
+# runs (#135's spec/sdo discriminant). Delegate the original's public
+# singleton surface to the Yeptris face so BOTH constants behave
+# identically regardless of which module object a caller holds.
+# ORIGINAL exists only when stdlib psych was already loaded (the
+# drop-in-before-psych order needs no delegation — nothing references
+# the original yet).
+if ::Yeptris::Psych.const_defined?(:ORIGINAL, false)
+  ::Psych::ORIGINAL.singleton_class.class_eval do
+    ::Psych::ORIGINAL.singleton_methods(false).each do |m|
+      define_method(m) do |*args, **kwargs, &block|
+        ::Yeptris::Psych.public_send(m, *args, **kwargs, &block)
+      end
+    end
+  end
+end

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.7.5".freeze
+  VERSION = "0.6.8.2".freeze
   # The error hierarchy lives in THIS file (the parent namespace's
   # own file): nested constants do not trigger a parent-constant
   # autoload, and the law forbids internal requires — defining the

data/vendor/libyeptris/CMakeLists.txt

@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(yeptris
-    VERSION 0.6.7
+    VERSION 0.6.8
     DESCRIPTION "Ultra-fast YAML 1.2 parser, emitter and streamer in C"
     LANGUAGES C CXX
 )

data/vendor/libyeptris/src/yeptris/cbor/encode.c

@@ -560,17 +560,25 @@ static size_t cbor_size_item(cenc* e, uint32_t id) {
     /* mapping */
     uint32_t pairs = n->count / 2;
     sz += cbor_arg_bytes(pairs);
-    cmap* cm = NULL;
+    /* hold the INDEX, not the pointer: sizing a child recurses into
+     * nested maps whose preps REALLOC e->maps (#152 — a held cmap*
+     * dangled and the next pair read walked freed memory; n>=11 of
+     * the depth-3 users shape crossed the 16->32 growth) */
+    size_t canon_mi = 0;
+    int canon = 0;
     if (e->canonical) {
         if (!cbor_canon_prepare(e, id, pairs)) {
             return 0;
         }
-        cm = &e->maps[e->nmaps - 1];
+        canon_mi = e->nmaps - 1;
+        canon = 1;
     }
-    if (cm != NULL) {
+    if (canon) {
         for (uint32_t p = 0; p < pairs && !e->failed; p++) {
+            const cmap* cm = &e->maps[canon_mi];
             sz += cbor_size_item(e, cm->child[cm->order[p] * 2]);
             if (!e->failed) {
+                cm = &e->maps[canon_mi];
                 sz += cbor_size_item(e, cm->child[cm->order[p] * 2 + 1]);
             }
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeptris
 version: !ruby/object:Gem::Version
-  version: 0.6.7.5
+  version: 0.6.8.2
 platform: ruby
 authors:
 - Ribose Inc.