yeptris 0.6.18.1-powerpc64le-linux → 0.6.18.2-powerpc64le-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9862df1f0e915266821b6203af43ca1a155a52087b1440d13b9cf3a60686df4
-  data.tar.gz: 38f82776605059d138065f7716dfb9ea49c67e1cea744095f8d3d4bcfe4b661b
+  metadata.gz: acff06db51e1b2f75561cdf73ea0e73555687c81fbcd347cc622ac0ec6b68fd5
+  data.tar.gz: dd5ebf0312542655c8f85c25426746310e1acfd362a88ce0facde164a7690928
 SHA512:
-  metadata.gz: 34ec5fc275de3c89442e0865db12fb7171afd1005ca724ce01e990e7e0d9eee043fdfea92bdbb7cf2fb1954c53e3c1baf096580ddfc36807a07c69dd44eeff02
-  data.tar.gz: e905916fbcf703e8190327b00e0c3d909c8dd022cef1c9c35143797af564e5ab8c14cca81afe765f063971b55871d54807af13a421439d61679c920ea8c6d096
+  metadata.gz: 9cb10bafe45359a09efd903970613995b1665a6aa6137c1a5f8d1cd3b6d13cea142a01ac2061892e3d3ebcc1c003c17c9153aeddc54f196ced37f0ec3ef8eb46
+  data.tar.gz: 625deef05e540b5dfc35d73943324cf62f3fbf59a617d515dcf0499b8ef6950197c2907345dfa14083457a12299b954c93c64cc8f11f609856765c293fcd8b0e

data/lib/yeptris/cbor.rb

@@ -121,7 +121,7 @@ module Yeptris
     def take_buffer(ptr, len_ptr)
       raise UnencodableError, ::Yeptris::FFI.last_error_message if ptr.null?
 
-      len = len_ptr.read_uint64
+      len = Yeptris::FFI.read_c_size_t(len_ptr)
       ptr.read_bytes(len).force_encoding(Encoding::BINARY)
     ensure
       ::Yeptris::FFI.yeptris_free(ptr) if ptr && !ptr.null?

data/lib/yeptris/document.rb

@@ -164,7 +164,7 @@ class Yeptris::Document
 
   def serialize(canonical: false, best_width: 0, explicit_doc_start: false)
     ensure_alive!
-    len = ::FFI::MemoryPointer.new(:uint64)
+    len = ::FFI::MemoryPointer.new(:size_t)
     ptr =
       if canonical || best_width.positive? || explicit_doc_start
         opts = Yeptris::FFI::EmitOptions.new
@@ -180,13 +180,13 @@ class Yeptris::Document
   end
 
   def serialize_json_compact
-    len = ::FFI::MemoryPointer.new(:uint64)
+    len = ::FFI::MemoryPointer.new(:size_t)
     Yeptris::FFI::Owned.string(Yeptris::FFI.yeptris_serialize_json_ex(@c_ptr, len, 1), len)
   end
 
   def serialize_json
     ensure_alive!
-    len = ::FFI::MemoryPointer.new(:uint64)
+    len = ::FFI::MemoryPointer.new(:size_t)
     Yeptris::FFI::Owned.string(Yeptris::FFI.yeptris_serialize_json(@c_ptr, len), len)
   end
 

data/lib/yeptris/ffi.rb

@@ -301,6 +301,17 @@ module Yeptris
       end
     end
 
+    # C out-params are size_t — native width (8 everywhere we ship
+    # except ILP32 armv7, where it is 4). The ffi gem (1.17.4) has no
+    # read_size_t, so dispatch on the measured type size: read_uint64
+    # on a 4-byte :size_t buffer ran out of bounds on arm-linux (the
+    # 0.6.18.1 armv7 smoke, valueml.rb:118).
+    SIZE_T_WIDTH = ::FFI.type_size(:size_t)
+
+    def self.read_c_size_t(ptr)
+      SIZE_T_WIDTH == 8 ? ptr.read_uint64 : ptr.read_uint32
+    end
+
     module Owned
       module_function
 
@@ -310,7 +321,7 @@ module Yeptris
       def string(ptr, len_out = nil)
         return nil if ptr.null?
 
-        len = len_out&.read_uint64
+        len = len_out && Yeptris::FFI.read_c_size_t(len_out)
         s = if len && len > 0
               ptr.read_bytes(len).force_encoding(Encoding::UTF_8)
             else

data/lib/yeptris/materializer.rb

@@ -78,10 +78,10 @@ module Yeptris
           end
           count_p = ::FFI::MemoryPointer.new(:size_t)
           records = Yeptris::FFI.yeptris_recorder_records(rec, count_p)
-          count = count_p.read_uint64
+          count = Yeptris::FFI.read_c_size_t(count_p)
           arena_len = ::FFI::MemoryPointer.new(:size_t)
           arena_ptr = Yeptris::FFI.yeptris_recorder_arena(rec, arena_len)
-          arena_len_v = arena_len.read_uint64
+          arena_len_v = Yeptris::FFI.read_c_size_t(arena_len)
           arena = arena_ptr.null? || arena_len_v.zero? ? +"" : arena_ptr.read_bytes(arena_len_v)
           flat = records.read_bytes(count * RECORD_SIZE)
                      .unpack(RECORD_UNPACK * count)

data/lib/yeptris/node.rb

@@ -50,11 +50,11 @@ class Yeptris::Node
 
   # Scalar content / alias name (UTF-8 String), nil for collections.
   def value
-    len = ::FFI::MemoryPointer.new(:uint64)
+    len = ::FFI::MemoryPointer.new(:size_t)
     ptr = alive { Yeptris::FFI.yeptris_node_value(@c_ptr, len) }
     return nil if ptr.null?
 
-    ptr.read_bytes(len.read_uint64).force_encoding(Encoding::UTF_8)
+    ptr.read_bytes(Yeptris::FFI.read_c_size_t(len)).force_encoding(Encoding::UTF_8)
   end
 
   STYLES = {
@@ -71,19 +71,19 @@ class Yeptris::Node
 
   # Explicit tag URI when present, else nil.
   def tag
-    len = ::FFI::MemoryPointer.new(:uint64)
+    len = ::FFI::MemoryPointer.new(:size_t)
     ptr = alive { Yeptris::FFI.yeptris_node_tag(@c_ptr, len) }
     return nil if ptr.null?
 
-    ptr.read_bytes(len.read_uint64).force_encoding(Encoding::UTF_8)
+    ptr.read_bytes(Yeptris::FFI.read_c_size_t(len)).force_encoding(Encoding::UTF_8)
   end
 
   def anchor
-    len = ::FFI::MemoryPointer.new(:uint64)
+    len = ::FFI::MemoryPointer.new(:size_t)
     ptr = alive { Yeptris::FFI.yeptris_node_anchor(@c_ptr, len) }
     return nil if ptr.null?
 
-    ptr.read_bytes(len.read_uint64).force_encoding(Encoding::UTF_8)
+    ptr.read_bytes(Yeptris::FFI.read_c_size_t(len)).force_encoding(Encoding::UTF_8)
   end
 
   def alias_target
@@ -293,7 +293,7 @@ class Yeptris::Node
     elsif st != Yeptris::FFI::OK
       raise Yeptris::ParseError, Yeptris::FFI.last_error_message
     else
-      bytes = out_p.read_pointer.read_bytes(olen_p.read_uint64)
+      bytes = out_p.read_pointer.read_bytes(Yeptris::FFI.read_c_size_t(olen_p))
       bytes.force_encoding(Encoding::ASCII_8BIT)
       ::Marshal.load(bytes)
     end

data/lib/yeptris/valueml.rb

@@ -38,9 +38,9 @@ module Yeptris
       yaml = Yeptris.read_input(yaml)
       yaml = yaml.to_s
       vals_p = ::FFI::MemoryPointer.new(:pointer)
-      count_p = ::FFI::MemoryPointer.new(:uint64)
+      count_p = ::FFI::MemoryPointer.new(:size_t)
       arena_p = ::FFI::MemoryPointer.new(:pointer)
-      alen_p = ::FFI::MemoryPointer.new(:uint64)
+      alen_p = ::FFI::MemoryPointer.new(:size_t)
       st = FFI.yeptris_value_drain(
         yaml, yaml.bytesize,
         schema == :compat_11 ? FFI::SCHEMA_11_COMPAT : FFI::SCHEMA_12_CORE,
@@ -51,9 +51,9 @@ module Yeptris
       vals = vals_p.read_pointer
       arena = arena_p.read_pointer
       begin
-        count = count_p.read_uint64
+        count = Yeptris::FFI.read_c_size_t(count_p)
         flat = vals.read_bytes(count * VALUE_SIZE).unpack(UNPACK * count)
-        arena_bytes = arena.read_bytes(alen_p.read_uint64)
+        arena_bytes = arena.read_bytes(Yeptris::FFI.read_c_size_t(alen_p))
         arena_bytes.force_encoding(Encoding::UTF_8)
         walk(flat, arena_bytes, schema == :compat_11)
       ensure
@@ -115,7 +115,7 @@ module Yeptris
       return nil if st == FFI::ERROR_UNSUPPORTED
       raise ParseError, FFI.last_error_message if st != FFI::OK
       buf = out_p.read_pointer
-      len = olen_p.read_uint64
+      len = Yeptris::FFI.read_c_size_t(olen_p)
       bytes = buf.read_bytes(len)
       bytes.force_encoding(Encoding::ASCII_8BIT)
       ::Marshal.load(bytes)

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.18.1".freeze
+  VERSION = "0.6.18.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeptris
 version: !ruby/object:Gem::Version
-  version: 0.6.18.1
+  version: 0.6.18.2
 platform: powerpc64le-linux
 authors:
 - Ribose Inc.