diff options
| author | Michael Orlitzky <michael@orlitzky.com> | 2015-11-09 12:08:36 -0500 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-12-09 12:04:16 +0100 |
| commit | 24f21a30121b24a74f9cc0fd4a4cb0541ad8f520 (patch) | |
| tree | a18599388ae499721127d4322cabfb2eae4ae693 | |
| parent | 38b68fc04249acdd98e7f3c51ddbec67c506946f (diff) | |
| download | php-git-24f21a30121b24a74f9cc0fd4a4cb0541ad8f520.tar.gz | |
ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909.
The test program for utf8_to_mutf7 attempts to call it without
arguments. The function expects one argument, however, and this leads
to a segfault as reported in PHP bug #66909.
The test program is using the PHP_IMAP_TEST_BUILD macro which
complicates things a little. To keep this diff small, the
PHP_IMAP_TEST_BUILD macro was modified to pass a fifth argument
"extra-source" to the PHP_TEST_BUILD macro. The check for
utf8_to_mutf7 was then modified to check for a dummy function,
utf8_to_mutf7_php, which passes the correct number of arguments to
utf8_to_mutf7.
PHP-Bug: https://bugs.php.net/bug.php?id=66909
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=376735
| -rw-r--r-- | ext/imap/config.m4 | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index d664215e66..d0b86cba1c 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 @@ -20,9 +20,9 @@ AC_DEFUN([IMAP_LIB_CHK],[ done ]) -dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok, extra-libs) +dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok, extra-libs, extra-source) AC_DEFUN([PHP_IMAP_TEST_BUILD], [ - PHP_TEST_BUILD([$1], [$2], [$3], [$4], + PHP_TEST_BUILD([$1], [$2], [$3], [$4], [$5] [ #if defined(__GNUC__) && __GNUC__ >= 4 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default"))) @@ -228,10 +228,15 @@ if test "$PHP_IMAP" != "no"; then AC_DEFINE(HAVE_IMAP_AUTH_GSS, 1, [ ]) ], [], $TST_LIBS) - dnl Check if utf8_to_mutf7 exists - PHP_IMAP_TEST_BUILD(utf8_to_mutf7, [ + dnl Check if utf8_to_mutf7 exists. We need to do some gymnastics because + dnl utf8_to_mutf7 takes an argument and will segfault without it. We + dnl therefore test another function utf8_to_mutf7_php() which calls + dnl the utf8_to_mutf7() function with the empty string as an argument. + PHP_IMAP_TEST_BUILD(utf8_to_mutf7_php, [ AC_DEFINE(HAVE_IMAP_MUTF7, 1, [ ]) - ], [], $TST_LIBS) + ], [], $TST_LIBS, [ + char utf8_to_mutf7_php(){ return utf8_to_mutf7(""); } + ]) AC_MSG_CHECKING(whether rfc822_output_address_list function present) PHP_TEST_BUILD(foobar, [ |