ffi 1.17.0.rc1 → 1.17.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ea15fd47a8241bb9bab7086d46ac6bc6ac752c383dc748c616d298f742ed0d0
-  data.tar.gz: 5253f331c7fea5590f4499133cac83dbeba5d833825339f4fc45cb57f0c94bcd
+  metadata.gz: 7442f86d48dd36654ca9c4f1579c4b4c151e0e74cb6fbe53b09357837a2a9851
+  data.tar.gz: a56f736bebf8ac565505bc97b15bbfc65270210e5e7ac8763f9eba4dde1cf441
 SHA512:
-  metadata.gz: e42a6fc177d1302b64a07b6b93a20bf9e0ad4e692a7ab2c16f1f5fbf65ce795fe044187befdcc5859ecb8f3870acac3ca3b687e5e96773f448d0b16e6a1d7710
-  data.tar.gz: 2efdb5b63defea13f90d5ec7a7f8c7fb85e3cab24fc84320c8e061017946687f0238a68a57375a4ce76aa67f041b6b65966170d4d98d5ed4cac4d1dbd3dc71df
+  metadata.gz: e0f9cd35b6ca6543525e15e82ef4d18934b0bb120cb46fc0ed6c60de99a014c124e3e12e0b5ca72a4582a398f624a59b993d990e05f67c21ed8511f7e759753a
+  data.tar.gz: d9054d9f0afd40c0b077dc0925a4af1b3959b871688d254d524850b185862a89eb10b05808043cf7a66095e41d0fd511b6b02a60ece240a1e9d48d406ec29cae

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-1.17.0.rc1 / 2024-04-07
+1.17.0.rc2 / 2024-04-22
+-------------------
+
+Fixed:
+* Add missing write barriers to StructLayout#initialize causing a segfault with GC.stress. #1079
+
+
+1.17.0.rc1 / 2024-04-08
 -------------------
 
 Fixed:

data/ext/ffi_c/FunctionInfo.c

@@ -183,7 +183,7 @@ fntype_initialize(int argc, VALUE* argv, VALUE self)
     Check_Type(rbParamTypes, T_ARRAY);
 
     TypedData_Get_Struct(self, FunctionType, &rbffi_fntype_data_type, fnInfo);
-    fnInfo->parameterCount = (int) RARRAY_LEN(rbParamTypes);
+    fnInfo->parameterCount = RARRAY_LENINT(rbParamTypes);
     fnInfo->parameterTypes = xcalloc(fnInfo->parameterCount, sizeof(*fnInfo->parameterTypes));
     fnInfo->ffiParameterTypes = xcalloc(fnInfo->parameterCount, sizeof(ffi_type *));
     fnInfo->nativeParameterTypes = xcalloc(fnInfo->parameterCount, sizeof(*fnInfo->nativeParameterTypes));

data/ext/ffi_c/StructLayout.c

@@ -460,9 +460,9 @@ struct_layout_allocate(VALUE klass)
     VALUE obj;
 
     obj = TypedData_Make_Struct(klass, StructLayout, &rbffi_struct_layout_data_type, layout);
-    layout->rbFieldMap = Qnil;
-    layout->rbFieldNames = Qnil;
-    layout->rbFields = Qnil;
+    RB_OBJ_WRITE(obj, &layout->rbFieldMap, Qnil);
+    RB_OBJ_WRITE(obj, &layout->rbFieldNames, Qnil);
+    RB_OBJ_WRITE(obj, &layout->rbFields, Qnil);
     layout->base.ffiType = xcalloc(1, sizeof(*layout->base.ffiType));
     layout->base.ffiType->size = 0;
     layout->base.ffiType->alignment = 0;
@@ -487,14 +487,14 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
     int i;
 
     TypedData_Get_Struct(self, StructLayout, &rbffi_struct_layout_data_type, layout);
-    layout->fieldCount = (int) RARRAY_LEN(fields);
-    layout->rbFieldMap = rb_hash_new();
-    layout->rbFieldNames = rb_ary_new2(layout->fieldCount);
+    layout->fieldCount = RARRAY_LENINT(fields);
+    RB_OBJ_WRITE(self, &layout->rbFieldMap, rb_hash_new());
+    RB_OBJ_WRITE(self, &layout->rbFieldNames, rb_ary_new2(layout->fieldCount));
     layout->size = (int) FFI_ALIGN(NUM2INT(size),  NUM2INT(align));
     layout->align = NUM2INT(align);
     layout->fields = xcalloc(layout->fieldCount, sizeof(StructField *));
     layout->ffiTypes = xcalloc(layout->fieldCount + 1, sizeof(ffi_type *));
-    layout->rbFields = rb_ary_new2(layout->fieldCount);
+    RB_OBJ_WRITE(self, &layout->rbFields, rb_ary_new2(layout->fieldCount));
     layout->referenceFieldCount = 0;
     layout->base.ffiType->elements = layout->ffiTypes;
     layout->base.ffiType->size = layout->size;

data/ext/ffi_c/Variadic.c

@@ -211,7 +211,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     Check_Type(parameterValues, T_ARRAY);
 
     TypedData_Get_Struct(self, VariadicInvoker, &variadic_data_type, invoker);
-    paramCount = (int) RARRAY_LEN(parameterTypes);
+    paramCount = RARRAY_LENINT(parameterTypes);
     paramTypes = ALLOCA_N(Type *, paramCount);
     ffiParamTypes = ALLOCA_N(ffi_type *, paramCount);
     params = ALLOCA_N(FFIStorage, paramCount);

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.17.0.rc1'
+  VERSION = '1.17.0.rc2'
 end

data.tar.gz.sig

@@ -1,2 +1,3 @@
-Eb�8݄�֗�pK�ozI4�y�Q:��(B��m���#m��2
-�f.Q�t-��p����%N$������yZ��A:8R�~�L��
���$j�=��A�Ň��|R{4�>\e!�����.A�W�Ŭ�ě�sq���Ī�MpC��I,?�Md޳�Ig#�q�7��$����߻hfE}��a�ppS�EK�bQd
+!��XI��D�]zf�w��qW���9����
+HЀ+��u������̟���C�;���V%^��Hs�J4��} �g���j��Q
+�![��D?�`�Uy`%.��}���?���y)

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.17.0.rc1
+  version: 1.17.0.rc2
 platform: ruby
 authors:
 - Wayne Meissner
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -33,7 +32,7 @@ cert_chain:
   5wFER6XhvvLDFAMh/jMg+s7Wd5SbSHgHNSUaUGVtdWkVPOer6oF0aLdZUR3CETkn
   5nWXZma/BUd3YgYA/Xumc6QQqIS4p7mr
   -----END CERTIFICATE-----
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -749,7 +748,6 @@ metadata:
   wiki_uri: https://github.com/ffi/ffi/wiki
   source_code_uri: https://github.com/ffi/ffi/
   mailing_list_uri: http://groups.google.com/group/ruby-ffi
-post_install_message:
 rdoc_options:
 - "--exclude=ext/ffi_c/.*\\.o$"
 - "--exclude=ffi_c\\.(bundle|so)$"
@@ -766,8 +764,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Ruby FFI
 test_files: []