msgpack 1.8.0 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efdb772bf54b74587a6c99e9513f9c16c78bbef3e5e3c17064a4be79fd5adb7a
-  data.tar.gz: d2f74cb1115947f5337cd730b6283fac61ceeed3a9457597cc90155b3dc93d7e
+  metadata.gz: ed5705d96741dbe59f61d59de79d133dfead8636cbf8c9db51b684c425a52e34
+  data.tar.gz: 6fa2a89acb1a2ae0db5068fa59b483d2292e0b9ad681f9c3c058cf164dd28385
 SHA512:
-  metadata.gz: 92da2466eac162f0d6d319496d7af3dbbef0d76b77c3aefb4787213e3b957464603859101ae28ac9620be82feb29278b2ed601adf2fd9d9811b364c258061d4b
-  data.tar.gz: a469586178eb44bbd50abf4cb34684f6a3fd4038063a80d9b3bf7f5cb9e6a2b34c1fed853be669f0bfb356d618efff3a2eaa51b86dd34d5427787a05453b8e11
+  metadata.gz: 8edfe983aaee5230a1c1547e45894403c9c4435a65bbe4d88b4e9a800bb31467ad867526f4d54baf2cd6b7738cd9458104fc0caa772bba0dcbcb25c427002218
+  data.tar.gz: 3d282debd040b4f9b0f2a15c2c34068b64d01c696d1756f235c63078e54d5fcc2d1896f1b32321aa2c70ec67b8205eb608e841aff60eecd78a651e614016eac3

data/ChangeLog

@@ -1,3 +1,18 @@
+2026-06-10 1.8.3
+
+* Fix an integer overflow when parsing maps.
+
+2026-06-09 1.8.2
+
+* Fix `Buffer#clear` to properly reset memory chunks before adding them back to the pool.
+  This could have caused data to leak across buffers when using the MessagePack::Buffer API
+  directly. [CVE-PENDING].
+
+2026-05-28 1.8.1
+
+* Workaround rare compilation issue when `rb_hash_new_capa` isn't properly detected.
+* Never pre-allocate strings larger than the buffered size.
+
 2025-02-06 1.8.0
 
 * Numerous small optimizations.

data/README.md

@@ -290,7 +290,7 @@ To update documents in gh-pages branch:
 
     bundle exec rake doc
     git checkout gh-pages
-    cp doc/* ./ -a
+    cp -a doc/* ./
 
 ## Copyright
 

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

@@ -85,6 +85,14 @@ public class Decoder implements Iterator<IRubyObject> {
     feed(bytes, offset, length);
   }
 
+  private int getUnsignedInt() {
+    int size = buffer.getInt();
+    if (size < 0) {
+      throw runtime.newRaiseException(underflowErrorClass, "Size too large (limited to 2**31 for the Java version)");
+    }
+    return size;
+  }
+
   public void feed(byte[] bytes) {
     feed(bytes, 0, bytes.length);
   }
@@ -200,7 +208,7 @@ public class Decoder implements Iterator<IRubyObject> {
       } else if (b == ARY16) {
         return runtime.newFixnum(buffer.getShort() & 0xffff);
       } else if (b == ARY32) {
-        return runtime.newFixnum(buffer.getInt());
+        return runtime.newFixnum(getUnsignedInt());
       }
       throw runtime.newRaiseException(unexpectedTypeErrorClass, "unexpected type");
     } catch (RaiseException re) {
@@ -221,7 +229,7 @@ public class Decoder implements Iterator<IRubyObject> {
       } else if (b == MAP16) {
         return runtime.newFixnum(buffer.getShort() & 0xffff);
       } else if (b == MAP32) {
-        return runtime.newFixnum(buffer.getInt());
+        return runtime.newFixnum(getUnsignedInt());
       }
       throw runtime.newRaiseException(unexpectedTypeErrorClass, "unexpected type");
     } catch (RaiseException re) {
@@ -258,10 +266,10 @@ public class Decoder implements Iterator<IRubyObject> {
         case TRUE:     return runtime.getTrue();
         case BIN8:     return consumeString(buffer.get() & 0xff, binaryEncoding);
         case BIN16:    return consumeString(buffer.getShort() & 0xffff, binaryEncoding);
-        case BIN32:    return consumeString(buffer.getInt(), binaryEncoding);
+        case BIN32:    return consumeString(getUnsignedInt(), binaryEncoding);
         case VAREXT8:  return consumeExtension(buffer.get() & 0xff);
         case VAREXT16: return consumeExtension(buffer.getShort() & 0xffff);
-        case VAREXT32: return consumeExtension(buffer.getInt());
+        case VAREXT32: return consumeExtension(getUnsignedInt());
         case FLOAT32:  return runtime.newFloat(buffer.getFloat());
         case FLOAT64:  return runtime.newFloat(buffer.getDouble());
         case UINT8:    return runtime.newFixnum(buffer.get() & 0xffL);
@@ -283,11 +291,11 @@ public class Decoder implements Iterator<IRubyObject> {
         case FIXEXT16: return consumeExtension(16);
         case STR8:     return consumeString(buffer.get() & 0xff, utf8Encoding);
         case STR16:    return consumeString(buffer.getShort() & 0xffff, utf8Encoding);
-        case STR32:    return consumeString(buffer.getInt(), utf8Encoding);
+        case STR32:    return consumeString(getUnsignedInt(), utf8Encoding);
         case ARY16:    return consumeArray(buffer.getShort() & 0xffff);
-        case ARY32:    return consumeArray(buffer.getInt());
+        case ARY32:    return consumeArray(getUnsignedInt());
         case MAP16:    return consumeHash(buffer.getShort() & 0xffff);
-        case MAP32:    return consumeHash(buffer.getInt());
+        case MAP32:    return consumeHash(getUnsignedInt());
         default: break outer;
         }
       case 0xe:

data/ext/msgpack/buffer.c

@@ -134,6 +134,9 @@ bool _msgpack_buffer_shift_chunk(msgpack_buffer_t* b)
          * because head should be always available */
         b->tail_buffer_end = NULL;
         b->read_buffer = NULL;
+        b->rmem_end = NULL;
+        b->rmem_last = NULL;
+        b->rmem_owner = NULL;
         return false;
     }
 

data/ext/msgpack/unpacker.c

@@ -67,10 +67,11 @@ static int16_t INITIAL_BUFFER_CAPACITY_MAX = SHRT_MAX;
 static msgpack_rmem_t s_stack_rmem;
 
 #if !defined(HAVE_RB_HASH_NEW_CAPA)
-static inline VALUE rb_hash_new_capa(long capa)
+static inline VALUE rb_hash_new_capa_inline(long capa)
 {
   return rb_hash_new();
 }
+#define rb_hash_new_capa rb_hash_new_capa_inline
 #endif
 
 static inline int16_t initial_buffer_size(long size)
@@ -335,7 +336,8 @@ static int read_raw_body_cont(msgpack_unpacker_t* uk)
     size_t length = uk->reading_raw_remaining;
 
     if(uk->reading_raw == Qnil) {
-        uk->reading_raw = rb_str_buf_new(length);
+        size_t buffered_size = msgpack_buffer_all_readable_size(UNPACKER_BUFFER_(uk));
+        uk->reading_raw = rb_str_buf_new(length > buffered_size ? buffered_size : length);
     }
 
     do {
@@ -454,13 +456,13 @@ static int read_primitive(msgpack_unpacker_t* uk)
         return object_complete(uk, INT2NUM((int8_t)b));
 
     SWITCH_RANGE(b, 0xa0, 0xbf)  // FixRaw / fixstr
-        int count = b & 0x1f;
+        size_t count = b & 0x1f;
         /* read_raw_body_begin sets uk->reading_raw */
         uk->reading_raw_remaining = count;
         return read_raw_body_begin(uk, RAW_TYPE_STRING);
 
     SWITCH_RANGE(b, 0x90, 0x9f)  // FixArray
-        int count = b & 0x0f;
+        size_t count = b & 0x0f;
         if(count == 0) {
             return object_complete(uk, rb_ary_new());
         }
@@ -636,7 +638,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xd9:  // raw 8 / str 8
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 1);
-                uint8_t count = cb.u8;
+                size_t count = cb.u8;
                 /* read_raw_body_begin sets uk->reading_raw */
                 uk->reading_raw_remaining = count;
                 return read_raw_body_begin(uk, RAW_TYPE_STRING);
@@ -645,7 +647,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xda:  // raw 16 / str 16
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 2);
-                uint16_t count = _msgpack_be16(cb.u16);
+                size_t count = _msgpack_be16(cb.u16);
                 /* read_raw_body_begin sets uk->reading_raw */
                 uk->reading_raw_remaining = count;
                 return read_raw_body_begin(uk, RAW_TYPE_STRING);
@@ -654,7 +656,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xdb:  // raw 32 / str 32
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 4);
-                uint32_t count = _msgpack_be32(cb.u32);
+                size_t count = _msgpack_be32(cb.u32);
                 /* read_raw_body_begin sets uk->reading_raw */
                 uk->reading_raw_remaining = count;
                 return read_raw_body_begin(uk, RAW_TYPE_STRING);
@@ -663,7 +665,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xc4:  // bin 8
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 1);
-                uint8_t count = cb.u8;
+                size_t count = cb.u8;
                 /* read_raw_body_begin sets uk->reading_raw */
                 uk->reading_raw_remaining = count;
                 return read_raw_body_begin(uk, RAW_TYPE_BINARY);
@@ -672,7 +674,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xc5:  // bin 16
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 2);
-                uint16_t count = _msgpack_be16(cb.u16);
+                size_t count = _msgpack_be16(cb.u16);
                 /* read_raw_body_begin sets uk->reading_raw */
                 uk->reading_raw_remaining = count;
                 return read_raw_body_begin(uk, RAW_TYPE_BINARY);
@@ -681,7 +683,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xc6:  // bin 32
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 4);
-                uint32_t count = _msgpack_be32(cb.u32);
+                size_t count = _msgpack_be32(cb.u32);
                 /* read_raw_body_begin sets uk->reading_raw */
                 uk->reading_raw_remaining = count;
                 return read_raw_body_begin(uk, RAW_TYPE_BINARY);
@@ -690,7 +692,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xdc:  // array 16
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 2);
-                uint16_t count = _msgpack_be16(cb.u16);
+                size_t count = _msgpack_be16(cb.u16);
                 if(count == 0) {
                     return object_complete(uk, rb_ary_new());
                 }
@@ -700,7 +702,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xdd:  // array 32
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 4);
-                uint32_t count = _msgpack_be32(cb.u32);
+                size_t count = _msgpack_be32(cb.u32);
                 if(count == 0) {
                     return object_complete(uk, rb_ary_new());
                 }
@@ -710,7 +712,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xde:  // map 16
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 2);
-                uint16_t count = _msgpack_be16(cb.u16);
+                size_t count = _msgpack_be16(cb.u16);
                 if(count == 0) {
                     return object_complete(uk, rb_hash_new());
                 }
@@ -720,7 +722,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xdf:  // map 32
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 4);
-                uint32_t count = _msgpack_be32(cb.u32);
+                size_t count = _msgpack_be32(cb.u32);
                 if(count == 0) {
                     return object_complete(uk, rb_hash_new());
                 }

data/lib/msgpack/version.rb

@@ -1,5 +1,5 @@
 module MessagePack
-  VERSION = "1.8.0"
+  VERSION = "1.8.3"
   # 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.

data/msgpack.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.description = %q{MessagePack is a binary-based efficient object serialization library. It enables to exchange structured objects between many languages like JSON. But unlike JSON, it is very fast and small.}
   s.authors = ["Sadayuki Furuhashi", "Theo Hultberg", "Satoshi Tagomori"]
   s.email = ["frsyuki@gmail.com", "theo@iconara.net", "tagomoris@gmail.com"]
-  s.license = "Apache 2.0"
-  s.homepage = "http://msgpack.org/"
+  s.license = "Apache-2.0"
+  s.homepage = "https://msgpack.org/"
   s.require_paths = ["lib"]
   if /java/ =~ RUBY_PLATFORM
     s.files = Dir['lib/**/*.rb', 'lib/**/*.jar', 'LICENSE']
@@ -23,6 +23,13 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.5"
 
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/msgpack/msgpack-ruby/issues",
+    "changelog_uri" => "https://github.com/msgpack/msgpack-ruby/blob/master/ChangeLog",
+    "documentation_uri" => "https://github.com/msgpack/msgpack/blob/master/spec.md",
+    "source_code_uri" => "https://github.com/msgpack/msgpack-ruby"
+  }
+
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rake-compiler', ['>= 1.1.9']
@@ -31,6 +38,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'json'
   s.add_development_dependency 'benchmark-ips', ['~> 2.10.0']
-
-  s.metadata["changelog_uri"] = "https://github.com/msgpack/msgpack-ruby/blob/master/ChangeLog"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 - Satoshi Tagomori
 bindir: bin
 cert_chain: []
-date: 2025-02-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,11 +188,14 @@ files:
 - lib/msgpack/unpacker.rb
 - lib/msgpack/version.rb
 - msgpack.gemspec
-homepage: http://msgpack.org/
+homepage: https://msgpack.org/
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata:
+  bug_tracker_uri: https://github.com/msgpack/msgpack-ruby/issues
   changelog_uri: https://github.com/msgpack/msgpack-ruby/blob/master/ChangeLog
+  documentation_uri: https://github.com/msgpack/msgpack/blob/master/spec.md
+  source_code_uri: https://github.com/msgpack/msgpack-ruby
 rdoc_options: []
 require_paths:
 - lib
@@ -207,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.12
 specification_version: 4
 summary: MessagePack, a binary-based efficient data interchange format.
 test_files: []