msgpack 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a5aa259ac95b61218c0f1cf10a23195bf3c847c7b1423172f50ece723363905
-  data.tar.gz: 9b3369d91349618e125cef788f3051fd706bcbbf01a78ed2afcb82ecd6d0ecf5
+  metadata.gz: 9a5462dff41bc8885570f42b59092d6e02729500a9a873aa15ead68ed8872ccb
+  data.tar.gz: 3fcc99b85b8ece0dd0158f2ee511784a789f41ab9d3bafd9f6fc006ccd3b9061
 SHA512:
-  metadata.gz: 9feed41442045775173abfcae2d384b27904c44b81cd3674dfa18bfbf10558c9f77ea2f2ed51b694101a33e37761fa94553108fedb866d4834bbce697f96579a
-  data.tar.gz: ae0d30ca66f5f4e1e22fcfee2615bd91db00ddfe101e043a0753e32bc7252c42d9bbfc3b763d3a519f20fdbb28ad0be2f5071472ad8b7c6c4053ac7702875432
+  metadata.gz: 3cb8969960d3d2de3beb39503cb33259ac169f27397d75f981a2563bf14700e4359ca30f2fc6357bf848b707546dc0c692385250c186496e2ef7d5546809bab3
+  data.tar.gz: 5cb7b9154e12839ee504c5630d3cee504558206ea63fb54236fc7433191a763267a7fce29a43157d59507f0cc1d4b5b88ba62607571ce98ca1175aa911c1c338

data/ChangeLog

@@ -1,3 +1,10 @@
+2026-09-11 1.8.5
+
+* Prevent stack depth underflow when skipping from recursive unpacker.
+* Fix `Unpacker#skip_nil` to properly consume the buffer.
+* Fix some small difference in Factory registration of the Java implementation.
+* Fix some Factory/ext_type optimization edge cases.
+
 2026-07-28 1.8.4
 
 * Fix `MessagePack::Buffer` to stop using already released memory page.

data/ext/java/org/msgpack/jruby/Factory.java

@@ -59,6 +59,7 @@ public class Factory extends RubyObject {
     Factory clone = (Factory)super.dup();
     clone.extensionRegistry = extensionRegistry();
     clone.hasSymbolExtType = hasSymbolExtType;
+    clone.hasBigIntExtType = hasBigIntExtType;
     return clone;
   }
 
@@ -110,8 +111,8 @@ public class Factory extends RubyObject {
 
     extensionRegistry.put(extModule, (int) typeId, recursive, packerProc, unpackerProc);
 
-    if (extModule == runtime.getSymbol() && !packerProc.isNil()) {
-      hasSymbolExtType = true;
+    if (extModule == runtime.getSymbol()) {
+      hasSymbolExtType = packerProc != null && !packerProc.isNil();
     }
 
     if (options != null) {
@@ -122,6 +123,8 @@ public class Factory extends RubyObject {
         } else {
           throw runtime.newArgumentError("oversized_integer_extension: true is only for Integer class");
         }
+      } else if (extModule == runtime.getModule("Integer")) {
+        hasBigIntExtType = false;
       }
     }
 

data/ext/msgpack/factory_class.c

@@ -121,7 +121,10 @@ static VALUE Factory_dup(VALUE self)
     msgpack_factory_t *fc = Factory_get(self);
     msgpack_factory_t *cloned_fc = Factory_get(clone);
 
+    cloned_fc->has_bigint_ext_type = fc->has_bigint_ext_type;
     cloned_fc->has_symbol_ext_type = fc->has_symbol_ext_type;
+    cloned_fc->optimized_symbol_ext_type = fc->optimized_symbol_ext_type;
+    cloned_fc->symbol_ext_type = fc->symbol_ext_type;
     cloned_fc->pkrg = fc->pkrg;
     msgpack_unpacker_ext_registry_borrow(fc->ukrg, &cloned_fc->ukrg);
     msgpack_packer_ext_registry_dup(clone, &fc->pkrg, &cloned_fc->pkrg);
@@ -230,12 +233,13 @@ static VALUE Factory_register_type_internal(VALUE self, VALUE rb_ext_type, VALUE
     }
 
     if(ext_module == rb_cSymbol) {
-        if(NIL_P(options) || RTEST(rb_hash_aref(options, ID2SYM(rb_intern("packer"))))) {
-            fc->has_symbol_ext_type = true;
-        }
-        if(RTEST(options) && RTEST(rb_hash_aref(options, ID2SYM(rb_intern("optimized_symbols_parsing"))))) {
-            fc->optimized_symbol_ext_type = true;
-        }
+        fc->symbol_ext_type = ext_type;
+        fc->has_symbol_ext_type = NIL_P(options) || RTEST(packer_proc);
+        fc->optimized_symbol_ext_type = RTEST(options) && RTEST(rb_hash_aref(options, ID2SYM(rb_intern("optimized_symbols_parsing"))));
+    }
+
+    if(ext_module == rb_cInteger) {
+        fc->has_bigint_ext_type = false;
     }
 
     if(RTEST(options)) {
@@ -246,7 +250,6 @@ static VALUE Factory_register_type_internal(VALUE self, VALUE rb_ext_type, VALUE
                 rb_raise(rb_eArgError, "oversized_integer_extension: true is only for Integer class");
             }
         }
-
         if(RTEST(rb_hash_aref(options, ID2SYM(rb_intern("recursive"))))) {
             flags |= MSGPACK_EXT_RECURSIVE;
         }

data/ext/msgpack/packer_class.c

@@ -235,7 +235,7 @@ static VALUE Packer_write_extension(VALUE self, VALUE obj)
 
     VALUE rb_ext_type = RSTRUCT_GET(obj, 0);
     if(!RB_TYPE_P(rb_ext_type, T_FIXNUM)) {
-        rb_raise(rb_eRangeError, "integer %s too big to convert to `signed char'", RSTRING_PTR(rb_String(rb_ext_type)));
+        rb_raise(rb_eRangeError, "integer %"PRIsVALUE" too big to convert to `signed char'", rb_ext_type);
     }
 
     int ext_type = FIX2INT(rb_ext_type);

data/ext/msgpack/unpacker.c

@@ -386,9 +386,15 @@ static inline int read_raw_body_begin(msgpack_unpacker_t* uk, int raw_type)
                  * instead of raising StackError like every other container type. */
                 return PRIMITIVE_STACK_TOO_DEEP;
             }
+            size_t barrier_depth = uk->stack.depth;
             int raised;
             obj = protected_proc_call(proc, 1, &uk->self, &raised);
-            msgpack_unpacker_stack_pop(uk);
+
+            /* The user proc can drive the unpacker itself (Unpacker#read, #skip,
+             * or a rescued error) and leave stack.depth anywhere, including 0.
+             * Restore it to just below the barrier we pushed instead of an
+             * unconditional decrement, which would underflow to SIZE_MAX. */
+            uk->stack.depth = barrier_depth - 1;
 
             if (raised) {
                 uk->last_object = rb_errinfo();
@@ -911,8 +917,8 @@ int msgpack_unpacker_skip_nil(msgpack_unpacker_t* uk)
         return b;
     }
     if(b == 0xc0) {
+        reset_head_byte(uk);
         return 1;
     }
     return 0;
 }
-

data/lib/msgpack/factory.rb

@@ -14,10 +14,12 @@ module MessagePack
           options[:packer] = packer.to_sym.to_proc
         when Method
           options[:packer] = packer.to_proc
-        when packer.respond_to?(:call)
-          options[:packer] = packer.method(:call).to_proc
         else
-          raise ::TypeError, "expected :packer argument to be a callable object, got: #{packer.inspect}"
+          if packer.respond_to?(:call)
+            options[:packer] = packer.method(:call).to_proc
+          else
+            raise ::TypeError, "expected :packer argument to be a callable object, got: #{packer.inspect}"
+          end
         end
 
         case unpacker = options[:unpacker]
@@ -27,10 +29,12 @@ module MessagePack
           options[:unpacker] = klass.method(unpacker).to_proc
         when Method
           options[:unpacker] = unpacker.to_proc
-        when packer.respond_to?(:call)
-          options[:unpacker] = unpacker.method(:call).to_proc
         else
-          raise ::TypeError, "expected :unpacker argument to be a callable object, got: #{unpacker.inspect}"
+          if unpacker.respond_to?(:call)
+            options[:unpacker] = unpacker.method(:call).to_proc
+          else
+            raise ::TypeError, "expected :unpacker argument to be a callable object, got: #{unpacker.inspect}"
+          end
         end
       end
 
@@ -51,7 +55,7 @@ module MessagePack
           type = ary[0]
           packer_proc = ary[1]
           unpacker_proc = nil
-          if unpacker.has_key?(type)
+          if unpacker.has_key?(type) && unpacker[type][0] == klass
             unpacker_proc = unpacker.delete(type)[1]
           end
           list << {type: type, class: klass, packer: packer_proc, unpacker: unpacker_proc}
@@ -85,7 +89,7 @@ module MessagePack
 
     def type_registered?(klass_or_type, selector=:both)
       case klass_or_type
-      when Class
+      when Module
         klass = klass_or_type
         registered_types(selector).any?{|entry| klass <= entry[:class] }
       when Integer

data/lib/msgpack/packer.rb

@@ -23,7 +23,7 @@ module MessagePack
 
     def type_registered?(klass_or_type)
       case klass_or_type
-      when Class
+      when Module
         klass = klass_or_type
         registered_types.any?{|entry| klass <= entry[:class] }
       when Integer

data/lib/msgpack/unpacker.rb

@@ -27,7 +27,7 @@ module MessagePack
 
     def type_registered?(klass_or_type)
       case klass_or_type
-      when Class
+      when Module
         klass = klass_or_type
         registered_types.any?{|entry| klass == entry[:class] }
       when Integer

data/lib/msgpack/version.rb

@@ -1,5 +1,5 @@
 module MessagePack
-  VERSION = "1.8.4"
+  VERSION = "1.8.5"
   # Note for maintainers:
   #  Don't miss building/releasing the JRuby version (rake buld:java)
   #  See "How to build -java rubygems" in README for more details.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi