ffi 1.17.1 → 1.17.3

data/ext/ffi_c/libffi/testsuite/libffi.bhaible/testcases.c

@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 
-FILE* out;
+FILE* out = NULL;
 
 #define uchar unsigned char
 #define ushort unsigned short

data/ext/ffi_c/libffi/testsuite/libffi.call/callback.c

@@ -7,9 +7,9 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-int i=5;
+static int i=5;
 
-void callback(void) { i++; }
+static void callback(void) { i++; }
 
 typedef struct
 {

data/ext/ffi_c/libffi/testsuite/libffi.call/callback2.c

@@ -7,9 +7,9 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-int i=5;
+static int i=5;
 
-void callback(void) { i++; }
+static void callback(void) { i++; }
 
 typedef struct
 {

data/ext/ffi_c/libffi/testsuite/libffi.call/callback3.c

@@ -7,9 +7,9 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-int i=5;
+static int i=5;
 
-void callback(void) { i++; }
+static void callback(void) { i++; }
 
 
 typedef struct

data/ext/ffi_c/libffi/testsuite/libffi.call/callback4.c

@@ -7,9 +7,9 @@
 /* { dg-do run } */
 #include "ffitest.h"
 
-int i=5;
+static int i=5;
 
-void callback(void) { i++; }
+static void callback(void) { i++; }
 
 
 typedef struct

data/ext/ffi_c/libffi/testsuite/libffi.call/ffitest.h

@@ -1,3 +1,6 @@
+#undef __USE_MINGW_ANSI_STDIO
+#define __USE_MINGW_ANSI_STDIO 1
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

data/ext/ffi_c/libffi/testsuite/libffi.call/longjmp.c

@@ -0,0 +1,60 @@
+/* Area:	ffi_call
+   Purpose:	Test longjmp over ffi_call frames */
+
+/* Test code adapted from Lars Kanis' bug report:
+   https://github.com/libffi/libffi/issues/905 */
+
+/* { dg-do run } */
+
+#include "ffitest.h"
+#include "ffi_common.h"
+
+#include <setjmp.h>
+
+static jmp_buf buf;
+
+static void ABI_ATTR lev2(const char *str) {
+  printf("lev2 %s\n", str);
+  // jumps back to where setjmp was called - making setjmp now return 1
+  longjmp(buf, 1);
+}
+
+static void ABI_ATTR lev1(const char *str) {
+  lev2(str);
+
+  // will not be reached
+  printf("lev1 %s\n", str);
+}
+
+int main()
+{
+  ffi_cif cif;
+  ffi_type *args[1];
+  void *values[1];
+  char *s;
+  ffi_arg rc;
+  /* Initialize the argument info vectors */
+  args[0] = &ffi_type_pointer;
+  values[0] = &s;
+  /* Initialize the cif */
+  if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1,
+    &ffi_type_sint, args) == FFI_OK)
+  {
+    s = "direct call";
+    if (!setjmp(buf)){
+      // works on x64 and arm64
+      lev1(s);
+    } else {
+      printf("back to main\n");
+    }
+
+    s = "through libffi";
+    if (!setjmp(buf)){
+      // works on x64 but segfaults on arm64
+      ffi_call(&cif, (void (*)(void))lev1, &rc, values);
+    } else {
+      printf("back to main\n");
+    }
+  }
+  return 0;
+}

data/ext/ffi_c/libffi/testsuite/libffi.call/overread.c

@@ -0,0 +1,54 @@
+/* Area:        ffi_call
+   Purpose:     Tests if ffi_call reads data beyond end.
+   Limitations: needs mmap.
+   PR:          887
+   Originator:  Mikulas Patocka <mikulas@twibright.com>  */
+
+/* { dg-do run } */
+
+#include "ffitest.h"
+
+#ifdef __linux__
+#include <sys/mman.h>
+#include <unistd.h>
+
+static int ABI_ATTR fn(unsigned char a, unsigned short b, unsigned int c, unsigned long d)
+{
+	return (int)(a + b + c + d);
+}
+#endif
+
+int main(void)
+{
+#ifdef __linux__
+	ffi_cif cif;
+	ffi_type *args[MAX_ARGS];
+	void *values[MAX_ARGS];
+	ffi_arg rint;
+	char *m;
+	int ps;
+	args[0] = &ffi_type_uchar;
+	args[1] = &ffi_type_ushort;
+	args[2] = &ffi_type_uint;
+	args[3] = &ffi_type_ulong;
+	CHECK(ffi_prep_cif(&cif, ABI_NUM, 4, &ffi_type_sint, args) == FFI_OK);
+	ps = getpagesize();
+	m = mmap(NULL, ps * 3, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+	CHECK(m != MAP_FAILED);
+	CHECK(mprotect(m, ps, PROT_NONE) == 0);
+	CHECK(mprotect(m + ps * 2, ps, PROT_NONE) == 0);
+	values[0] = m + ps * 2 - sizeof(unsigned char);
+	values[1] = m + ps * 2 - sizeof(unsigned short);
+	values[2] = m + ps * 2 - sizeof(unsigned int);
+	values[3] = m + ps * 2 - sizeof(unsigned long);
+	ffi_call(&cif, FFI_FN(fn), &rint, values);
+	CHECK((int)rint == 0);
+	values[0] = m + ps;
+	values[1] = m + ps;
+	values[2] = m + ps;
+	values[3] = m + ps;
+	ffi_call(&cif, FFI_FN(fn), &rint, values);
+	CHECK((int)rint == 0);
+#endif
+	exit(0);
+}

data/ext/ffi_c/libffi/testsuite/libffi.call/struct_int_float.c

@@ -0,0 +1,88 @@
+/* Area:	ffi_call
+   Purpose:	Demonstrate structures with integers corrupting earlier floats
+   Limitations:	none.
+   PR:		#848
+   Originator:	kellda  */
+
+/* { dg-do run } */
+#include "ffitest.h"
+
+typedef struct
+{
+  unsigned long i;
+  float f;
+} test_structure_int_float;
+
+static float ABI_ATTR struct_int_float(test_structure_int_float ts1,
+                                       test_structure_int_float ts2 __UNUSED__,
+                                       test_structure_int_float ts3 __UNUSED__,
+                                       test_structure_int_float ts4 __UNUSED__,
+                                       test_structure_int_float ts5 __UNUSED__,
+                                       test_structure_int_float ts6 __UNUSED__)
+{
+  return ts1.f;
+}
+
+int main (void)
+{
+  ffi_cif cif;
+  ffi_type *args[MAX_ARGS];
+  void *values[MAX_ARGS];
+  ffi_type ts_type;
+  ffi_type *ts_type_elements[3];
+  float rfloat;
+
+  test_structure_int_float ts_arg[6];
+
+  ts_type.size = 0;
+  ts_type.alignment = 0;
+  ts_type.type = FFI_TYPE_STRUCT;
+  ts_type.elements = ts_type_elements;
+  ts_type_elements[0] = &ffi_type_ulong;
+  ts_type_elements[1] = &ffi_type_float;
+  ts_type_elements[2] = NULL;
+
+  args[0] = &ts_type;
+  values[0] = &ts_arg[0];
+  args[1] = &ts_type;
+  values[1] = &ts_arg[1];
+  args[2] = &ts_type;
+  values[2] = &ts_arg[2];
+  args[3] = &ts_type;
+  values[3] = &ts_arg[3];
+  args[4] = &ts_type;
+  values[4] = &ts_arg[4];
+  args[5] = &ts_type;
+  values[5] = &ts_arg[5];
+
+  /* Initialize the cif */
+  CHECK(ffi_prep_cif(&cif, ABI_NUM, 6, &ffi_type_float, args) == FFI_OK);
+
+  ts_arg[0].i = 1;
+  ts_arg[0].f = 11.11f;
+  ts_arg[1].i = 2;
+  ts_arg[1].f = 22.22f;
+  ts_arg[2].i = 3;
+  ts_arg[2].f = 33.33f;
+  ts_arg[3].i = 4;
+  ts_arg[3].f = 44.44f;
+  ts_arg[4].i = 5;
+  ts_arg[4].f = 55.55f;
+  ts_arg[5].i = 6;
+  ts_arg[5].f = 66.66f;
+
+  printf ("%g\n", ts_arg[0].f);
+  printf ("%g\n", ts_arg[1].f);
+  printf ("%g\n", ts_arg[2].f);
+  printf ("%g\n", ts_arg[3].f);
+  printf ("%g\n", ts_arg[4].f);
+  printf ("%g\n", ts_arg[5].f);
+
+  ffi_call(&cif, FFI_FN(struct_int_float), &rfloat, values);
+
+  printf ("%g\n", rfloat);
+
+  CHECK(fabs(rfloat - 11.11) < 3 * FLT_EPSILON);
+
+  exit(0);
+}

data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct2.c

@@ -33,6 +33,7 @@ test_fn (int n, ...)
   struct small_tag s2;
   struct large_tag l;
 
+  (void) n;
   va_start (ap, n);
   s1 = va_arg (ap, struct small_tag);
   l = va_arg (ap, struct large_tag);

data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct3.c

@@ -33,6 +33,7 @@ test_fn (int n, ...)
   struct small_tag s2;
   struct large_tag l;
 
+  (void) n;
   va_start (ap, n);
   s1 = va_arg (ap, struct small_tag);
   l = va_arg (ap, struct large_tag);

data/ext/ffi_c/libffi/testsuite/libffi.call/x32.c

@@ -0,0 +1,31 @@
+/* Area:        ffi_call
+   Purpose:     Check zero-extension of pointers on x32.
+   Limitations: none.
+   PR:          887
+   Originator:  Mikulas Patocka <mikulas@twibright.com>  */
+
+/* { dg-do run } */
+
+#include "ffitest.h"
+
+static int ABI_ATTR fn(int *a)
+{
+	if (a)
+		return *a;
+	return -1;
+}
+
+int main(void)
+{
+	ffi_cif cif;
+	ffi_type *args[MAX_ARGS];
+	void *values[MAX_ARGS];
+	void *z[2] = { (void *)0, (void *)1 };
+	ffi_arg rint;
+	args[0] = &ffi_type_pointer;
+	values[0] = z;
+	CHECK(ffi_prep_cif(&cif, ABI_NUM, 1, &ffi_type_sint, args) == FFI_OK);
+	ffi_call(&cif, FFI_FN(fn), &rint, values);
+	CHECK((int)rint == -1);
+	exit(0);
+}

data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_dbls_struct.c

@@ -28,7 +28,7 @@ closure_test_gn(ffi_cif* cif __UNUSED__, void* resp __UNUSED__,
 	closure_test_fn(*(Dbls*)args[0]);
 }
 
-int main(int argc __UNUSED__, char** argv __UNUSED__)
+int main(void)
 {
 	ffi_cif cif;
 

data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_sshortchar.c

@@ -80,7 +80,7 @@ int main (void)
   /* { dg-output "1 32765 127 -128: 32765" } */
   printf("res: %d\n", (signed short)res_call);
   /* { dg-output "\nres: 32765" } */
-  CHECK(res_call == 32765);
+  CHECK((signed short)res_call == 32765);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, test_func_gn, NULL, code)  == FFI_OK);
 

data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_ushortchar.c

@@ -80,7 +80,7 @@ int main (void)
   /* { dg-output "1 2 127 128: 258" } */
   printf("res: %d\n", (unsigned short)res_call);
   /* { dg-output "\nres: 258" } */
-  CHECK(res_call == 258);
+  CHECK((unsigned short)res_call == 258);
 
   CHECK(ffi_prep_closure_loc(pcl, &cif, test_func_gn, NULL, code)  == FFI_OK);
 

data/ext/ffi_c/libffi/testsuite/libffi.closures/huge_struct.c

@@ -216,8 +216,7 @@ cls_large_fn(ffi_cif* cif __UNUSED__, void* resp, void** args, void* userdata __
 		ui8_5, si8_5);
 }
 
-int
-main(int argc __UNUSED__, const char** argv __UNUSED__)
+int main (void)
 {
         void *code;
 	ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code);

data/ext/ffi_c/libffi/testsuite/libffi.closures/unwindtest.cc

@@ -48,7 +48,9 @@ typedef int (*closure_test_type1)(float, float, float, float, signed short,
 				  float, float, int, double, int, int, float,
 				  int, int, int, int);
 
+#ifdef __EMSCRIPTEN__
 extern "C"
+#endif
 int main (void)
 {
   ffi_cif cif;

data/ext/ffi_c/libffi/testsuite/libffi.closures/unwindtest_ffi_call.cc

@@ -14,7 +14,9 @@ static int checking(int a __UNUSED__, short b __UNUSED__,
   throw 9;
 }
 
+#ifdef __EMSCRIPTEN__
 extern "C"
+#endif
 int main (void)
 {
   ffi_cif cif;

data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_int.c

@@ -76,7 +76,7 @@ int main (void)
 
   printf ("%d,%di %d,%di, x %d 1234, y %d 11110\n",
 	  (int)tc_result, (int)(tc_result * -I), 2, 8, tc_int_arg_x, tc_y);
-  /* dg-output "-2,8i 2,8i, x 1234 1234, y 11110 11110" */
+  /* { dg-output "-2,8i 2,8i, x 1234 1234, y 11110 11110" } */
   CHECK (creal (tc_result) == -2);
   CHECK (cimag (tc_result) == 8);
   CHECK (tc_int_arg_x == 1234);

data/ext/ffi_c/libffi/testsuite/libffi.threads/ffitest.h

@@ -0,0 +1 @@
+#include "../libffi.call/ffitest.h"

data/ext/ffi_c/libffi/testsuite/libffi.threads/threads.exp

@@ -0,0 +1,50 @@
+# Copyright (C) 2003, 2006, 2009, 2010, 2014 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+dg-init
+libffi-init
+
+global srcdir subdir
+
+if { [string match $compiler_vendor "microsoft"] } {
+    # -wd4005  macro redefinition
+    # -wd4244  implicit conversion to type of smaller size
+    # -wd4305  truncation to smaller type
+    # -wd4477  printf %lu of uintptr_t
+    # -wd4312  implicit conversion to type of greater size
+    # -wd4311  pointer truncation to unsigned long
+    # -EHsc    C++ Exception Handling (no SEH exceptions)
+    set additional_options "-wd4005 -wd4244 -wd4305 -wd4477 -wd4312 -wd4311 -EHsc";
+} else {
+    set additional_options "";
+}
+
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.c]]
+
+# No pthreads for windows or wasm
+if { [string match $compiler_vendor "microsoft"] || [istarget "wasm*-*-*"] } {
+    foreach test $tlist {
+        unsupported "$test"
+    }
+} else {
+    run-many-tests $tlist $additional_options
+}
+
+dg-finish
+
+# Local Variables:
+# tcl-indent-level:4
+# End:

data/ext/ffi_c/libffi/testsuite/libffi.threads/tsan.c

@@ -0,0 +1,74 @@
+/* { dg-do run } */
+
+#include "ffitest.h"
+
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define NUM_THREADS 20
+
+#if defined(_POSIX_BARRIERS) && _POSIX_BARRIERS > 0
+pthread_barrier_t barrier;
+#endif
+
+typedef float (*callback_fn)(float, float);
+
+void callback(ffi_cif *cif __UNUSED__, void *ret, void **args, void *userdata __UNUSED__) {
+    float a = *(float *)args[0];
+    float b = *(float *)args[1];
+    *(float *)ret = a / 2 + b / 2;
+}
+
+void *thread_func(void *arg) {
+#if defined(_POSIX_BARRIERS) && _POSIX_BARRIERS > 0
+    pthread_barrier_wait(&barrier);
+#endif
+
+    ffi_cif cif;
+    ffi_type *args[2] = { &ffi_type_float, &ffi_type_float };
+
+    if (ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, &ffi_type_float, args) != FFI_OK) {
+        fprintf(stderr, "ffi_prep_cif failed\n");
+        return NULL;
+    }
+
+    ffi_closure *closure = ffi_closure_alloc(sizeof(ffi_closure), (void **)&arg);
+
+    if (ffi_prep_closure_loc(closure, &cif, callback, NULL, arg) != FFI_OK) {
+        fprintf(stderr, "ffi_prep_closure_loc failed\n");
+        return NULL;
+    }
+
+    callback_fn fn = (callback_fn)arg;
+    (void) fn(4.0f, 6.0f);
+
+    ffi_closure_free(closure);
+    return NULL;
+}
+
+int main() {
+    pthread_t threads[NUM_THREADS];
+
+#if defined(_POSIX_BARRIERS) && _POSIX_BARRIERS > 0
+    pthread_barrier_init(&barrier, NULL, NUM_THREADS);
+#endif
+
+    for (int i = 0; i < NUM_THREADS; ++i) {
+        if (pthread_create(&threads[i], NULL, thread_func, NULL) != 0) {
+            perror("pthread_create");
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    for (int i = 0; i < NUM_THREADS; ++i) {
+        pthread_join(threads[i], NULL);
+    }
+
+#if defined(_POSIX_BARRIERS) && _POSIX_BARRIERS > 0
+    pthread_barrier_destroy(&barrier);
+#endif
+
+    printf("Completed\n");
+    return 0;
+}

data/ext/ffi_c/libffi.mk

@@ -16,3 +16,8 @@ $(LIBFFI):
 		sh $(LIBFFI_CONFIGURE) $(LIBFFI_HOST) > /dev/null; \
 	fi
 	$(MAKE) -C "$(LIBFFI_BUILD_DIR)"
+
+install: install-cleanup
+
+install-cleanup: $(DLLIB)
+	rm -rf "$(LIBFFI_BUILD_DIR)"

data/ffi.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |s|
     s.metadata['wiki_uri'] = 'https://github.com/ffi/ffi/wiki'
     s.metadata['source_code_uri'] = 'https://github.com/ffi/ffi/'
     s.metadata['mailing_list_uri'] = 'http://groups.google.com/group/ruby-ffi'
+    s.metadata['rubygems_mfa_required'] = 'true'
   end
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f =~ /^(\.|bench|gen|libtest|nbproject|spec)/
+    f =~ /^(\.|bench|gen|libtest|nbproject|spec|rakelib)/
   end
 
   # Add libffi git files
@@ -35,8 +36,6 @@ Gem::Specification.new do |s|
   s.license = 'BSD-3-Clause'
   s.require_paths << 'ext/ffi_c'
   s.required_ruby_version = '>= 2.5'
-  s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'rake-compiler', '~> 1.1'
-  s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
-  s.add_development_dependency 'rspec', '~> 2.14.1'
+
+  s.metadata['msys2_mingw_dependencies'] = 'libffi'
 end

data/lib/ffi/autopointer.rb

@@ -89,6 +89,12 @@ module FFI
       self
     end
 
+    def dup
+      raise RuntimeError, "cannot duplicate FFI::AutoPointer"
+    end
+
+    alias clone dup
+
     # @return [nil]
     # Free the pointer.
     def free

data/lib/ffi/compat.rb

@@ -40,4 +40,15 @@ module FFI
       obj.freeze
     end
   end
+
+  if defined?(Ractor.shareable_proc)
+    # This is for FFI internal use only.
+    def self.shareable_proc(**kwargs, &block)
+      Ractor.shareable_proc(**kwargs, &block)
+    end
+  else
+    def self.shareable_proc(**_kwargs, &block)
+      block
+    end
+  end
 end

data/lib/ffi/function.rb

@@ -51,6 +51,29 @@ module FFI
       end
     end
 
+    if RUBY_PLATFORM == 'aarch64-mingw-ucrt'
+      # Use a workaround for https://github.com/libffi/libffi/issues/905
+      def attach(mod, name)
+        this = self
+        body = proc do |*args, &block|
+          this.call(*args, &block)
+        end
+
+        mod.define_method(name, body)
+        mod.define_singleton_method(name, body)
+
+        # Store function Proc's for re-definition as Ractor-shareable in Library#freeze
+        funcs = mod.instance_variable_get("@ffi_function_procs")
+        unless funcs
+          funcs = {}
+          mod.instance_variable_set("@ffi_function_procs", funcs)
+        end
+        funcs[name] = self
+
+        self
+      end
+    end
+
     # Stash the Function in a module variable so it can be inspected by attached_functions.
     # On CRuby it also ensures that it does not get garbage collected.
     module RegisterAttach

data/lib/ffi/library.rb

@@ -287,7 +287,7 @@ module FFI
       if type.is_a?(Class) && type < FFI::Struct
         # If it is a global struct, just attach directly to the pointer
         s = s = type.new(address) # Assigning twice to suppress unused variable warning
-        self.module_eval <<-code, __FILE__, __LINE__
+        self.module_eval(<<-code, __FILE__, __LINE__)
           @ffi_gsvars = {} unless defined?(@ffi_gsvars)
           @ffi_gsvars[#{mname.inspect}] = s
           def self.#{mname}
@@ -302,7 +302,7 @@ module FFI
         #
         # Attach to this module as mname/mname=
         #
-        self.module_eval <<-code, __FILE__, __LINE__
+        self.module_eval(<<-code, __FILE__, __LINE__)
           @ffi_gvars = {} unless defined?(@ffi_gvars)
           @ffi_gvars[#{mname.inspect}] = s
           def self.#{mname}
@@ -564,12 +564,28 @@ module FFI
     # Freeze all definitions of the module
     #
     # This freezes the module's definitions, so that it can be used in a Ractor.
-    # No further methods or variables can be attached and no further enums or typedefs can be created in this module afterwards.
+    # No further functions or variables can be attached and no further enums or typedefs can be created in this module afterwards.
     def freeze
+      # @ffi_function_procs is only used on aarch64-mingw-ucrt
+      instance_variable_get("@ffi_function_procs")&.each do |name, func|
+        # Redefine attached functions as Ractor-shareable.
+        # The function Proc can't be shareable from the beginning, since it references enums and typedefs.
+        this = FFI.make_shareable(func)
+        body = FFI.shareable_proc(self: nil) do |*args, &block|
+          this.call(*args, &block)
+        end
+        undef_method(name)
+        singleton_class.undef_method(name)
+
+        define_method(name, body)
+        define_singleton_method(name, body)
+      end
+
       instance_variables.each do |name|
         var = instance_variable_get(name)
         FFI.make_shareable(var)
       end
+      super
       nil
     end
   end

data/lib/ffi/struct_by_reference.rb

@@ -44,7 +44,7 @@ module FFI
     end
 
     # Always get {FFI::Type}::POINTER.
-    def native_type
+    def native_type(_type = nil)
       FFI::Type::POINTER
     end