yeptris 0.6.7.5 → 0.6.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a084064bffdbce7ccb0461e1402e7a91331e530e71b9ad31967d82e6e5b751db
-  data.tar.gz: 0e8c5b97a1e09ef1f3bc4672806b777d68260075536370eedc8b628513f439f8
+  metadata.gz: b263a55abf16d57caf2c85268f108dc87059f9188c21e1b2a622129a6a8056f9
+  data.tar.gz: dcd7ae19f1d52c9615d1d4dd169a632483e8bc40f6303f0f4591aff8b1684c30
 SHA512:
-  metadata.gz: 9791fdedd1c2afc3588abb612a8b98bd8ae57f065aea74db052b49f46025dfa52c40acb60a2aebb12acb41a5d464a957185d4ee62e0a07b38e069fcc94d431b2
-  data.tar.gz: 6e3931a4cd862b8e8061d9b0c999f73113e0f62e11952ae630abbfd42cbfd76dd3f935a52990ee94a646c319e391b24f379398b940a3ca3fc101084fa31fda9c
+  metadata.gz: 999a6efa21ae21f9defc24546fa66e083ae9cf95dde6e6d93266c5ad75542b7c1a2923d19bda028124c1f825e447ab4062faf44ba31d6bf1199447e51492d582
+  data.tar.gz: 13afb6d81ca5795279dcebd790b4fae32d3e41abff68faacc7510d20c6557d0d358fb1bd217feee8d95b7aeb21b7b36cfc6f0d7f21e31a5e92e6e97f1f5c1292

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.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.1".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.1
 platform: ruby
 authors:
 - Ribose Inc.