google-protobuf 3.24.0-x86_64-darwin → 3.24.1-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9d2c353ff1774393043affa3232df79f306167853cbe35d06a0b608c7a763ff
-  data.tar.gz: 9044a4698b5589ebd0b3ee8b6653c97b9ceec3916aa57e70245760356d46b7c8
+  metadata.gz: 2536d4ebbd7a7b86c67c660d3df73cf3f5f5ae0f8ec7603c9670fa7a61eb300e
+  data.tar.gz: 345d7985a2144023ece71d96afab2a4a6da88d47454e876971fa2e60f4a10546
 SHA512:
-  metadata.gz: f7c51744dd53ca8db7cbc0ac53850a554034ddcbd9df74326fc9a7b56fe5bb797a2d4f0419a63ee4ecad469e8eb235639142c7162e723693a07b032952aec049
-  data.tar.gz: 7588e86effbf03d1c5cbae48d2c1fc0e120bf74b7b2b333e2469053b1bde0caf50ef0dcc5ab899f56bbcf93f2ec6ed00830effb4703458484c0799c025246a40
+  metadata.gz: 195222ed28fa505f89a75aa01a04fb6e2b239d77897358ab44346d073bfe9c824a02b92ecc98a7a2e51ccd04423b5f7a411e7fe530ed2f6c995ae7ecc502956a
+  data.tar.gz: 472fb7e446eb6903af17b5eeae4a65dcae943a515beec8c3ffc9d46a33ea9708794b1b4d33b0ccf20c9a51d1954f698b0c4a509d49f28d93708868c7a1aefde8

data/ext/google/protobuf_c/protobuf.c

@@ -276,17 +276,25 @@ static void ObjectCache_Init(VALUE protobuf) {
   rb_const_set(protobuf, rb_intern("SIZEOF_VALUE"), INT2NUM(SIZEOF_VALUE));
 }
 
-VALUE ObjectCache_TryAdd(const void *key, VALUE val) {
+static VALUE ObjectCache_GetKey(const void *key) {
   VALUE key_val = (VALUE)key;
   PBRUBY_ASSERT((key_val & 3) == 0);
-  return rb_funcall(weak_obj_cache, item_try_add, 2, LL2NUM(key_val), val);
+  // Ensure the key can be stored as a Fixnum since 1 bit is needed for
+  // FIXNUM_FLAG and 1 bit is needed for the sign bit.
+  VALUE new_key = LL2NUM(key_val >> 2);
+  PBRUBY_ASSERT(FIXNUM_P(new_key));
+  return new_key;
+}
+
+VALUE ObjectCache_TryAdd(const void *key, VALUE val) {
+  VALUE key_val = ObjectCache_GetKey(key);
+  return rb_funcall(weak_obj_cache, item_try_add, 2, key_val, val);
 }
 
 // Returns the cached object for this key, if any. Otherwise returns Qnil.
 VALUE ObjectCache_Get(const void *key) {
-  VALUE key_val = (VALUE)key;
-  PBRUBY_ASSERT((key_val & 3) == 0);
-  return rb_funcall(weak_obj_cache, item_get, 1, LL2NUM(key_val));
+  VALUE key_val = ObjectCache_GetKey(key);
+  return rb_funcall(weak_obj_cache, item_get, 1, key_val);
 }
 
 /*

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.24.0
+  version: 3.24.1
 platform: x86_64-darwin
 authors:
 - Protobuf Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -111,7 +111,7 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.24.0/ruby
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.24.1/ruby
 post_install_message: 
 rdoc_options: []
 require_paths: