cbor 0.5.9.9 → 0.5.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a3fa9f403e4ae0b3e86d1f1edcb9c7326d7e40d5c81b622ba45c6fedb907dd3
-  data.tar.gz: 735749121ea8c1baa84bb372bd069880032ff4378d4141b6e977327fb7c9be07
+  metadata.gz: fafbded4dd72295218759d12eea5b09b280ec06719eca7d646164173a2405fe2
+  data.tar.gz: abcc97eaa52ad9abd549b3bf18819ff2982f09d1ab283df06ff46d7f10a4c470
 SHA512:
-  metadata.gz: 8950068d33324e6d341bb399ec2b4f36d1e62fe8a532c1f9b532712a6108f0241238d298aa2923d40de10f88fa07481d29f4fb1ef08114a5124278c1c102401d
-  data.tar.gz: 7dcd27dd1df6dcd7f9f6e90c75e73ce6d8812f96196a9978afcfab73cd113de616810d684dfba62e0cb624b5cd29f6f0f636db0e3ea1e5c2d5306a614f1d099c
+  metadata.gz: 82e84122c5a22dc4a6644823d92a33de60a55f58ef0844637aad0e72a6fdf899afa1f016aafc1306e12ec323c55c035ef5a9148252c68f162fd75d222f61262f
+  data.tar.gz: a68bc717c4886e2dc5dd969941f2f33d620bcdbe8d9609ab06356ecc7d2de7e26699c21f8b56eb51d3b942204772e84413778aa7fb7fdcfb9a933c7a1923362a

data/ext/cbor/buffer_class.c

@@ -73,8 +73,6 @@ static ID get_partial_read_method(VALUE io)
 {
     if(rb_respond_to(io, s_readpartial)) {
         return s_readpartial;
-    } else if(rb_respond_to(io, s_read)) {
-        return s_read;
     } else {
         return s_read;
     }

data/ext/cbor/packer.h

@@ -170,17 +170,25 @@ static inline void msgpack_packer_write_double(msgpack_packer_t* pk, double v)
     msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 5);
     castbuf.u32 = _msgpack_be_float(castbuf.u32);
     msgpack_buffer_write_byte_and_data(PACKER_BUFFER_(pk), IB_FLOAT4, castbuf.mem, 4);
-  } else if (v != v) {          /* NaN */
-    cbor_encoder_write_head(pk, 0xe0, 0x7e00);
   } else {
-    msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 9);
     union {
         double d;
         uint64_t u64;
         char mem[8];
     } castbuf = { v };
-    castbuf.u64 = _msgpack_be_double(castbuf.u64);
-    msgpack_buffer_write_byte_and_data(PACKER_BUFFER_(pk), IB_FLOAT8, castbuf.mem, 8);
+    if (v != v && (castbuf.u64 & 0x1fffffffUL) == 0) { /* NaN && can narrow */
+      uint64_t sign = castbuf.u64 >> 63;
+      uint64_t mant = castbuf.u64 & 0xfffffffffffff; /* 52 bits */
+      if ((mant & 0x3ffffffffffUL) == 0) { /* 42 zero bits: narrow to f16 */
+        cbor_encoder_write_head(pk, 0xe0, sign << 15 | 0x7c00 | mant >> 42);
+      } else {                  /* 29 zero bits (checked above): narrow to f32 */
+        cbor_encoder_write_head(pk, 0xe0, sign << 31 | 0x7f800000 | mant >> 29);
+      }
+    } else {                    /* can't narrow */
+      msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 9);
+      castbuf.u64 = _msgpack_be_double(castbuf.u64);
+      msgpack_buffer_write_byte_and_data(PACKER_BUFFER_(pk), IB_FLOAT8, castbuf.mem, 8);
+    }
   }
 }
 

data/ext/cbor/unpacker.c

@@ -417,11 +417,21 @@ static int read_primitive(msgpack_unpacker_t* uk)
       switch (ai) {
         case AI_2: {  // half
           int exp = (val >> 10) & 0x1f;
-          int mant = val & 0x3ff;
+          int mant = val & 0x3ff; /* 10 bits */
           double res;
           if (exp == 0) res = ldexp(mant, -24);
           else if (exp != 31) res = ldexp11(mant + 1024, exp - 25);
-          else res = mant == 0 ? INFINITY : NAN;
+          else {
+            if (mant == 0)
+              res = INFINITY;
+            else { /* NAN */
+              union {
+                uint64_t u64;
+                double d;
+              } castbuf = { (val & 0x8000) << 48 | 0x7ff0000000000000UL | (uint64_t)mant << 42 };
+              return object_complete(uk, rb_float_new(castbuf.d));
+            }
+          }
           return object_complete(uk, rb_float_new(val & 0x8000 ? -res : res));
         }
         case AI_4:  // float
@@ -429,8 +439,17 @@ static int read_primitive(msgpack_unpacker_t* uk)
               union {
                 uint32_t u32;
                 float f;
-              } castbuf = { (uint32_t)val };
-              return object_complete(uk, rb_float_new(castbuf.f));
+              } castbuf = { (uint32_t)val }; /* sets Q to 1 for NAN */
+              if (castbuf.f == castbuf.f) {
+                return object_complete(uk, rb_float_new(castbuf.f));
+              } else { /* NAN */
+                uint64_t mant = val & 0x7fffff; /* 23 bits */
+                union {
+                  uint64_t u64;
+                  double d;
+                } castbuf1 = { (val & 0x80000000UL) << 32 | 0x7ff0000000000000UL | mant << 29 };
+                return object_complete(uk, rb_float_new(castbuf1.d));
+              }
             }
         case AI_8:  // double
             {
@@ -664,6 +683,7 @@ int msgpack_unpacker_read(msgpack_unpacker_t* uk, size_t target_stack_depth)
                 if(msgpack_unpacker_stack_pop(uk) <= target_stack_depth) {
                     return PRIMITIVE_OBJECT_COMPLETE;
                 }
+                r = PRIMITIVE_OBJECT_COMPLETE;
                 goto container_completed;
             }
         }

data/lib/cbor/version.rb

@@ -1,3 +1,3 @@
 module CBOR
-	VERSION = "0.5.9.9"
+	VERSION = "0.5.10.2"
 end

data/spec/format_spec.rb

@@ -334,6 +334,66 @@ describe MessagePack do
     }.should raise_error(MessagePack::MalformedFormatError)
   end
 
+  # Regression tests for https://github.com/cabo/cbor-ruby/issues/20
+  # Nested indefinite-length containers should decode correctly.
+
+  it "{_ 'a' => [_ 1]}" do
+    # indefinite map containing an indefinite array
+    check_decode "\xbf\x61a\x9f\x01\xff\xff", {"a" => [1]}
+  end
+
+  it "{_ 'a' => [_ 1], 'b' => [2, 3]}" do
+    # indefinite map containing an indefinite and a definite array
+    check_decode "\xbf\x61a\x9f\x01\xff\x61b\x82\x02\x03\xff", {"a" => [1], "b" => [2, 3]}
+  end
+
+  it "{_ 'a' => {_ 'b' => 1}}" do
+    # indefinite map containing an indefinite map
+    check_decode "\xbf\x61a\xbf\x61b\x01\xff\xff", {"a" => {"b" => 1}}
+  end
+
+  it "{_ 'a' => {_ }}" do
+    # indefinite map containing an empty indefinite map
+    check_decode "\xbf\x61a\xbf\xff\xff", {"a" => {}}
+  end
+
+  it "{_ 'a' => {_ NO BREAK}" do
+    # indefinite map containing an empty indefinite map
+    lambda {
+      check_decode "\xbf\x61a\xbf\xff", {"a" => {}}
+    }.should raise_error(EOFError)
+  end
+
+  it "{_ 'a' => {} NO BREAK" do
+    # indefinite map containing an empty indefinite map
+    lambda {
+      check_decode "\xbf\x61a\xa0", {"a" => {}}
+    }.should raise_error(EOFError)
+  end
+
+  it "{_ 'a' => {_ 'b' => 1}, 'b' => {'c' => 2}}" do
+    # indefinite map containing an indefinite and a definite map
+    check_decode "\xbf\x61a\xbf\x61b\x01\xff\x61b\xa1\x61c\x02\xff", {"a" => {"b" => 1}, "b" => {"c" => 2}}
+  end
+
+  it "[_ {_ 'a' => 1}]" do
+    # indefinite array containing an indefinite map
+    check_decode "\x9f\xbf\x61a\x01\xff\xff", [{"a" => 1}]
+  end
+
+  it "{_ 'files' => [{_ 'name' => 'foo'}]}" do
+    # indefinite map containing a definite array of indefinite maps
+    # (the exact pattern produced by Jackson's CBOR serializer)
+    check_decode "\xbf\x65files\x81\xbf\x64name\x63foo\xff\xff",
+                 {"files" => [{"name" => "foo"}]}
+  end
+
+  it "deeply nested indefinite containers" do
+    # {_ "a" => {_ "b" => [_ {_ "c" => 1}]}}
+    check_decode "\xbf\x61a\xbf\x61b\x9f\xbf\x61c\x01\xff\xff\xff\xff",
+                 {"a" => {"b" => [{"c" => 1}]}}
+  end
+
   it "(_ a b)" do
     check_decode "\x7f\xff", "".encode_as_utf8
     check_decode "\x5f\xff", "".b

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cbor
 version: !ruby/object:Gem::Version
-  version: 0.5.9.9
+  version: 0.5.10.2
 platform: ruby
 authors:
 - Carsten Bormann, standing on the tall shoulders of Sadayuki Furuhashi
 bindir: bin
 cert_chain: []
-date: 2025-08-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.2
 specification_version: 4
 summary: CBOR, Concise Binary Object Representation.
 test_files: