com php-fuzzing-sapi: Support both -lFuzzer and OSS-Fuzz: .gitignore Makefile.frag config.m4
| From: | Johannes Schlüter | Date: | Mon, 04 Mar 2019 02:38:13 +0000 |
| Subject: | com php-fuzzing-sapi: Support both -lFuzzer and OSS-Fuzz: .gitignore Makefile.frag config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105131@lists.php.net to get a copy of this message | ||
Commit: 046640debd71e943d55ac1eaa40e4a157e09764d
Author: Stanislav Malyshev <smalyshev@gmail.com> Sun, 3 Mar 2019 18:38:13 -0800
Parents: 1fec0cd083c60bf9422acaca6cb564ce2f66fe6b
Branches: master
Link: http://git.php.net/?p=php-fuzzing-sapi.git;a=commitdiff;h=046640debd71e943d55ac1eaa40e4a157e09764d
Log:
Support both -lFuzzer and OSS-Fuzz
Changed paths:
M .gitignore
M Makefile.frag
M config.m4
Diff:
diff --git a/.gitignore b/.gitignore
index 3b764f0..d0f7bda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
*.lo
*.o
.*.swp
+.idea
\ No newline at end of file
diff --git a/Makefile.frag b/Makefile.frag
index 91f0da4..b1398d8 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -1,10 +1,10 @@
fuzzer: $(PHP_FUZZER_BINARIES)
$(SAPI_FUZZER_PATH)/php-fuzz-parser: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_FUZZER_PARSER_OBJS)
- $(LIBTOOL) --mode=link $(CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)
$(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS)
$(PHP_FUZZER_PARSER_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -lFuzzer -o
$(SAPI_FUZZER_PATH)/php-fuzz-parser
+ $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)
$(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS)
$(PHP_FUZZER_PARSER_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o
$(SAPI_FUZZER_PATH)/php-fuzz-parser
$(SAPI_FUZZER_PATH)/php-fuzz-unserialize: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
$(PHP_FUZZER_UNSERIALIZE_OBJS)
- $(LIBTOOL) --mode=link $(CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)
$(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS)
$(PHP_FUZZER_UNSERIALIZE_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -lFuzzer -o
$(SAPI_FUZZER_PATH)/php-fuzz-unserialize
+ $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)
$(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS)
$(PHP_FUZZER_UNSERIALIZE_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o
$(SAPI_FUZZER_PATH)/php-fuzz-unserialize
$(SAPI_FUZZER_PATH)/php-fuzz-json: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_FUZZER_JSON_OBJS)
- $(LIBTOOL) --mode=link $(CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)
$(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS)
$(PHP_FUZZER_JSON_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -lFuzzer -o
$(SAPI_FUZZER_PATH)/php-fuzz-json
+ $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)
$(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS)
$(PHP_FUZZER_JSON_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o
$(SAPI_FUZZER_PATH)/php-fuzz-json
diff --git a/config..m4 b/config.m4
index e877236..52f5fde 100644
--- a/config.m4
+++ b/config.m4
@@ -11,14 +11,23 @@ if test "$PHP_FUZZER" != "no"; then
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/fuzzer/Makefile.frag)
SAPI_FUZZER_PATH=sapi/fuzzer
PHP_SUBST(SAPI_FUZZER_PATH)
- AX_CHECK_COMPILE_FLAG([-fsanitize-coverage=edge -fsanitize=address], [
+ if -z "$LIB_FUZZING_ENGINE"; then
+ FUZZING_LIB="-lFuzzer"
+ FUZZING_CC="$CC"
+ AX_CHECK_COMPILE_FLAG([-fsanitize-coverage=edge -fsanitize=address], [
CFLAGS="$CFLAGS -fsanitize-coverage=edge -fsanitize=address"
CXXFLAGS="$CXXFLAGS -fsanitize-coverage=edge -fsanitize=address"
LDFLAGS="$LDFLAGS -fsanitize-coverage=edge -fsanitize=address"
- ],[
+ ],[
AC_MSG_ERROR(compiler doesn't support -fsanitize flags)
- ])
-
+ ])
+ else
+ FUZZING_LIB="-lFuzzingEngine"
+ FUZZING_CC="$CXX"
+ fi
+ PHP_SUBST(FUZZING_LIB)
+ PHP_SUBST(FUZZING_CC)
+
dnl PHP_SELECT_SAPI(fuzzer-parser, program, $FUZZER_SOURCES, , '$(SAPI_FUZZER_PATH)')
PHP_ADD_BUILD_DIR([sapi/fuzzer])