From: Tyson Andre <tysonandre775@hotmail.com>
Date: Mon, 18 Feb 2019 16:47:09 +0000 (-0500)
Subject: Fix ffi test on Windows
X-Git-Tag: php-7.4.0alpha1~989
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdfe11f80d5affd6d5386d84dff0d81323b60bc4;p=php

Fix ffi test on Windows

Fixes a bug in test added in
5661feb1ef929111ef7765672fcb49813eee86fc, by checking that the
relevant SO exists.

Also adds an additional test that is based on zend_printf, and
should work on both Linux and Windows.
---

diff --git a/ext/ffi/tests/bug77632.phpt b/ext/ffi/tests/bug77632.phpt
index ebaf3dccf9..314424548a 100644
--- a/ext/ffi/tests/bug77632.phpt
+++ b/ext/ffi/tests/bug77632.phpt
@@ -1,7 +1,14 @@
 --TEST--
 Bug #77632 (FFI Segfaults When Called With Variadics)
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
+<?php
+require_once('skipif.inc');
+try {
+	$libc = FFI::cdef("int printf(const char *format, ...);", "libc.so.6");
+} catch (Throwable $_) {
+	die('skip libc.so.6 not available');
+}
+?>
 --INI--
 ffi.enable=1
 --FILE--
diff --git a/ext/ffi/tests/bug77632b.phpt b/ext/ffi/tests/bug77632b.phpt
new file mode 100644
index 0000000000..a988306745
--- /dev/null
+++ b/ext/ffi/tests/bug77632b.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #77632 (FFI function pointers with variadics)
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+try {
+	FFI::cdef("extern void *zend_printf;");
+} catch (Throwable $_) {
+	die('skip PHP symbols not available');
+}
+?>
+--INI--
+ffi.enable=1
+--FILE--
+<?php
+$libc = FFI::cdef("extern size_t (*zend_printf)(const char *format, ...);");
+$args = ["test from zend_printf\n"];
+($libc->zend_printf)(...$args);
+$args2 = ["Hello, %s from zend_printf\n", "world"];
+($libc->zend_printf)(...$args2);
+?>
+--EXPECT--
+test from zend_printf
+Hello, world from zend_printf