archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Autotools: Sync CS in sapi/fuzzer (#15417)

Browse source 
- AS_VAR_IF macro used
- redundant quotes removed
- PHP_FUZZER_TARGET macro body synced with the rest of the macros in
  php-src
- PHP_FUZZER_TARGET arguments quoted
This commit is contained in:
Peter Kokot 2024-08-15 11:38:34 +02:00 • committed by GitHub
parent 4b2dc58651
commit 1e4ed4adaa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
sapi/fuzzer/config.m4
View file

@ -8,13 +8,15 @@ PHP_ARG_ENABLE([fuzzer],
dnl For newer Clang versions see https://llvm.org/docs/LibFuzzer.html#fuzzer-usage dnl For newer Clang versions see https://llvm.org/docs/LibFuzzer.html#fuzzer-usage
dnl for relevant flags. dnl for relevant flags.
dnl Macro to define fuzzing target dnl
dnl PHP_FUZZER_TARGET(name, target-var) dnl PHP_FUZZER_TARGET(name, target-var)
dnl dnl
dnl Macro to define the fuzzing target.
dnl
AC_DEFUN([PHP_FUZZER_TARGET], [ AC_DEFUN([PHP_FUZZER_TARGET], [
PHP_FUZZER_BINARIES="$PHP_FUZZER_BINARIES $SAPI_FUZZER_PATH/php-fuzz-$1" PHP_FUZZER_BINARIES="$PHP_FUZZER_BINARIES $SAPI_FUZZER_PATH/php-fuzz-$1"
PHP_SUBST([$2]) PHP_SUBST([$2])
PHP_ADD_SOURCES_X([sapi/fuzzer],[fuzzer-$1.c],[],$2) PHP_ADD_SOURCES_X([sapi/fuzzer], [fuzzer-$1.c], [], [$2])
$2="[$]$2 $FUZZER_COMMON_OBJS" $2="[$]$2 $FUZZER_COMMON_OBJS"
]) ])
@ -30,19 +32,18 @@ if test "$PHP_FUZZER" != "no"; then
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fuzzer/Makefile.frag]) PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fuzzer/Makefile.frag])
SAPI_FUZZER_PATH=sapi/fuzzer SAPI_FUZZER_PATH=sapi/fuzzer
PHP_SUBST([SAPI_FUZZER_PATH]) PHP_SUBST([SAPI_FUZZER_PATH])
if test -z "$LIB_FUZZING_ENGINE"; then AS_VAR_IF([LIB_FUZZING_ENGINE],, [
FUZZING_LIB="-fsanitize=fuzzer" FUZZING_LIB="-fsanitize=fuzzer"
FUZZING_CC="$CC" FUZZING_CC=$CC
AX_CHECK_COMPILE_FLAG([-fsanitize=fuzzer-no-link], [ AX_CHECK_COMPILE_FLAG([-fsanitize=fuzzer-no-link], [
CFLAGS="$CFLAGS -fsanitize=fuzzer-no-link" CFLAGS="$CFLAGS -fsanitize=fuzzer-no-link"
CXXFLAGS="$CXXFLAGS -fsanitize=fuzzer-no-link" CXXFLAGS="$CXXFLAGS -fsanitize=fuzzer-no-link"
],[ ],
AC_MSG_ERROR([Compiler doesn't support -fsanitize=fuzzer-no-link]) [AC_MSG_ERROR([Compiler doesn't support -fsanitize=fuzzer-no-link])])
]) ], [
else FUZZING_LIB=$LIB_FUZZING_ENGINE
FUZZING_LIB="$LIB_FUZZING_ENGINE"
FUZZING_CC="$CXX -stdlib=libc++" FUZZING_CC="$CXX -stdlib=libc++"
fi ])
PHP_SUBST([FUZZING_LIB]) PHP_SUBST([FUZZING_LIB])
PHP_SUBST([FUZZING_CC]) PHP_SUBST([FUZZING_CC])
@ -55,21 +56,21 @@ if test "$PHP_FUZZER" != "no"; then
PHP_ADD_SOURCES_X([sapi/fuzzer], [fuzzer-sapi.c], [], [FUZZER_COMMON_OBJS]) PHP_ADD_SOURCES_X([sapi/fuzzer], [fuzzer-sapi.c], [], [FUZZER_COMMON_OBJS])
PHP_FUZZER_TARGET([parser], PHP_FUZZER_PARSER_OBJS) PHP_FUZZER_TARGET([parser], [PHP_FUZZER_PARSER_OBJS])
PHP_FUZZER_TARGET([execute], PHP_FUZZER_EXECUTE_OBJS) PHP_FUZZER_TARGET([execute], [PHP_FUZZER_EXECUTE_OBJS])
PHP_FUZZER_TARGET([function-jit], PHP_FUZZER_FUNCTION_JIT_OBJS) PHP_FUZZER_TARGET([function-jit], [PHP_FUZZER_FUNCTION_JIT_OBJS])
PHP_FUZZER_TARGET([tracing-jit], PHP_FUZZER_TRACING_JIT_OBJS) PHP_FUZZER_TARGET([tracing-jit], [PHP_FUZZER_TRACING_JIT_OBJS])
PHP_FUZZER_TARGET([unserialize], PHP_FUZZER_UNSERIALIZE_OBJS) PHP_FUZZER_TARGET([unserialize], [PHP_FUZZER_UNSERIALIZE_OBJS])
PHP_FUZZER_TARGET([unserializehash], PHP_FUZZER_UNSERIALIZEHASH_OBJS) PHP_FUZZER_TARGET([unserializehash], [PHP_FUZZER_UNSERIALIZEHASH_OBJS])
PHP_FUZZER_TARGET([json], PHP_FUZZER_JSON_OBJS) PHP_FUZZER_TARGET([json], [PHP_FUZZER_JSON_OBJS])
if test -n "$enable_exif" && test "$enable_exif" != "no"; then if test -n "$enable_exif" && test "$enable_exif" != "no"; then
PHP_FUZZER_TARGET([exif], PHP_FUZZER_EXIF_OBJS) PHP_FUZZER_TARGET([exif], [PHP_FUZZER_EXIF_OBJS])
fi fi
if test -n "$enable_mbstring" && test "$enable_mbstring" != "no"; then if test -n "$enable_mbstring" && test "$enable_mbstring" != "no"; then
PHP_FUZZER_TARGET([mbstring], PHP_FUZZER_MBSTRING_OBJS) PHP_FUZZER_TARGET([mbstring], [PHP_FUZZER_MBSTRING_OBJS])
if test -n "$enable_mbregex" && test "$enable_mbregex" != "no"; then if test -n "$enable_mbregex" && test "$enable_mbregex" != "no"; then
PHP_FUZZER_TARGET([mbregex], PHP_FUZZER_MBREGEX_OBJS) PHP_FUZZER_TARGET([mbregex], [PHP_FUZZER_MBREGEX_OBJS])
fi fi
fi fi