ffi 1.17.1 → 1.17.2

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/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_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.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/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.17.1'
+  VERSION = '1.17.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.17.1
+  version: 1.17.2
 platform: ruby
 authors:
 - Wayne Meissner
@@ -32,7 +32,7 @@ cert_chain:
   DrkJ9tVlPQtJB0LqT0tvBap4upnwT1xYq721b5dwH6AF4Pi6iz/dc5vnq1/MH8bV
   8VbbBzzeE7MsvgkP3sHlLmY8PtuyViJ8
   -----END CERTIFICATE-----
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -171,7 +171,6 @@ files:
 - ext/ffi_c/libffi/.ci/powerpc-eabisim.exp
 - ext/ffi_c/libffi/.ci/site.exp
 - ext/ffi_c/libffi/.ci/wine-sim.exp
-- ext/ffi_c/libffi/.circleci/config.yml
 - ext/ffi_c/libffi/.gitattributes
 - ext/ffi_c/libffi/.github/issue_template.md
 - ext/ffi_c/libffi/.github/workflows/build.yml
@@ -306,9 +305,6 @@ files:
 - ext/ffi_c/libffi/src/moxie/eabi.S
 - ext/ffi_c/libffi/src/moxie/ffi.c
 - ext/ffi_c/libffi/src/moxie/ffitarget.h
-- ext/ffi_c/libffi/src/nios2/ffi.c
-- ext/ffi_c/libffi/src/nios2/ffitarget.h
-- ext/ffi_c/libffi/src/nios2/sysv.S
 - ext/ffi_c/libffi/src/or1k/ffi.c
 - ext/ffi_c/libffi/src/or1k/ffitarget.h
 - ext/ffi_c/libffi/src/or1k/sysv.S
@@ -329,6 +325,7 @@ files:
 - ext/ffi_c/libffi/src/powerpc/ffi_powerpc.h
 - ext/ffi_c/libffi/src/powerpc/ffi_sysv.c
 - ext/ffi_c/libffi/src/powerpc/ffitarget.h
+- ext/ffi_c/libffi/src/powerpc/internal.h
 - ext/ffi_c/libffi/src/powerpc/linux64.S
 - ext/ffi_c/libffi/src/powerpc/linux64_closure.S
 - ext/ffi_c/libffi/src/powerpc/ppc_closure.S
@@ -422,6 +419,7 @@ files:
 - ext/ffi_c/libffi/testsuite/libffi.call/many_mixed.c
 - ext/ffi_c/libffi/testsuite/libffi.call/negint.c
 - ext/ffi_c/libffi/testsuite/libffi.call/offsets.c
+- ext/ffi_c/libffi/testsuite/libffi.call/overread.c
 - ext/ffi_c/libffi/testsuite/libffi.call/pr1172638.c
 - ext/ffi_c/libffi/testsuite/libffi.call/promotion.c
 - ext/ffi_c/libffi/testsuite/libffi.call/pyobjc_tc.c
@@ -461,6 +459,7 @@ files:
 - ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_4f.c
 - ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_big.c
 - ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_small.c
+- ext/ffi_c/libffi/testsuite/libffi.call/struct_int_float.c
 - ext/ffi_c/libffi/testsuite/libffi.call/struct_return_2H.c
 - ext/ffi_c/libffi/testsuite/libffi.call/struct_return_8H.c
 - ext/ffi_c/libffi/testsuite/libffi.call/uninitialized.c
@@ -470,6 +469,7 @@ files:
 - ext/ffi_c/libffi/testsuite/libffi.call/va_struct1.c
 - ext/ffi_c/libffi/testsuite/libffi.call/va_struct2.c
 - ext/ffi_c/libffi/testsuite/libffi.call/va_struct3.c
+- ext/ffi_c/libffi/testsuite/libffi.call/x32.c
 - ext/ffi_c/libffi/testsuite/libffi.closures/closure.exp
 - ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn0.c
 - ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn1.c

data/ext/ffi_c/libffi/.circleci/config.yml

@@ -1,156 +0,0 @@
-version: 2.1
-
-defaults: &defaults
-  working_directory: ~/repo
-  docker:
-    # Built from:
-    # https://github.com/pyodide/pyodide/blob/2ab4b0ab6aefe99fd994bb4f9ab086e5c0aebb7b/Dockerfile
-    - image: pyodide/pyodide-env:20230126-chrome109-firefox109-py311
-
-jobs:
-  install-emsdk:
-    <<: *defaults
-    steps:
-      - checkout
-      - run:
-          name: install emsdk
-          command: |
-            git clone https://github.com/emscripten-core/emsdk.git --depth=1
-            cd emsdk
-            ./emsdk install 3.1.30
-            ./emsdk activate 3.1.30
-
-      - persist_to_workspace:
-          root: .
-          paths:
-            - emsdk
-
-  build:
-    parameters:
-      wasm-bigint:
-        description: Should we build with wasm-bigint?
-        type: string
-        default: ""
-    environment:
-      WASM_BIGINT: << parameters.wasm-bigint >>
-    <<: *defaults
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-
-      - run:
-          name: build
-          command: |
-            source ./emsdk/emsdk_env.sh
-            ./testsuite/emscripten/build.sh
-
-      - run:
-          name: build tests
-          command: |
-            source ./emsdk/emsdk_env.sh
-            cp -r testsuite/libffi.call testsuite/libffi.call.test
-            cp -r testsuite/libffi.closures testsuite/libffi.closures.test
-            ./testsuite/emscripten/build-tests.sh testsuite/libffi.call.test
-            ./testsuite/emscripten/build-tests.sh testsuite/libffi.closures.test
-
-      - persist_to_workspace:
-          root: .
-          paths:
-            - target
-            - testsuite
-
-  test:
-    parameters:
-      test-params:
-        description: The tests to run.
-        type: string
-    <<: *defaults
-    steps:
-      - checkout
-
-      - attach_workspace:
-          at: .
-
-      - run:
-          name: run tests
-          command: |
-            git reset --hard
-            cd testsuite/emscripten/
-            mkdir test-results
-            pytest \
-              --junitxml=test-results/junit.xml \
-               test_libffi.py \
-               << parameters.test-params >>
-      - store_test_results:
-          path: testsuite/emscripten/test-results
-
-  test-dejagnu:
-    parameters:
-      params:
-        description: Parameters to node-tests
-        type: string
-        default: ""
-
-    <<: *defaults
-    steps:
-      - checkout
-
-      - attach_workspace:
-          at: .
-
-      - run:
-          name: run tests
-          command: |
-            source ./emsdk/emsdk_env.sh
-            testsuite/emscripten/node-tests.sh << parameters.params >>
-
-workflows:
-  version: 2
-  build-and-test:
-    jobs:
-      - install-emsdk
-
-      - build:
-          name: build
-          requires:
-            - install-emsdk
-
-      - build:
-          name: build-bigint
-          wasm-bigint: "true"
-          requires:
-            - install-emsdk
-
-      - test:
-          name: test-firefox
-          test-params: -k firefox
-          requires:
-            - build
-      - test:
-          name: test-chrome
-          test-params: -k chrome
-          requires:
-            - build
-
-      - test:
-          name: test-firefox-bigint
-          test-params: -k firefox
-          requires:
-            - build-bigint
-
-      - test:
-          name: test-chrome-bigint
-          test-params: -k chrome
-          requires:
-            - build-bigint
-
-      - test-dejagnu:
-          name: test-dejagnu
-          requires:
-            - install-emsdk
-      - test-dejagnu:
-          name: test-dejagnu-bigint
-          params: --wasm-bigint
-          requires:
-            - install-emsdk