From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 29 May 2020 10:05:42 +0000 (+0200)
Subject: Remove json checks in fuzzer SAPI
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7562679b45a00c0fe95d444b06897913e09bfdaa;p=php

Remove json checks in fuzzer SAPI

JSON is now always enabled
---

diff --git a/sapi/fuzzer/config.m4 b/sapi/fuzzer/config.m4
index 37945b8e9e..8e15a274ec 100644
--- a/sapi/fuzzer/config.m4
+++ b/sapi/fuzzer/config.m4
@@ -76,11 +76,8 @@ if test "$PHP_FUZZER" != "no"; then
 
   PHP_FUZZER_TARGET([parser], PHP_FUZZER_PARSER_OBJS)
   PHP_FUZZER_TARGET([unserialize], PHP_FUZZER_UNSERIALIZE_OBJS)
+  PHP_FUZZER_TARGET([json], PHP_FUZZER_JSON_OBJS)
 
-  dnl json extension is enabled by default
-  if (test -n "$enable_json" && test "$enable_json" != "no") || test -z "$PHP_ENABLE_ALL"; then
-    PHP_FUZZER_TARGET([json], PHP_FUZZER_JSON_OBJS)
-  fi
   if test -n "$enable_exif" && test "$enable_exif" != "no"; then
     PHP_FUZZER_TARGET([exif], PHP_FUZZER_EXIF_OBJS)
   fi
diff --git a/sapi/fuzzer/fuzzer-json.c b/sapi/fuzzer/fuzzer-json.c
index 45ec78ae4c..85fa8bbc8e 100644
--- a/sapi/fuzzer/fuzzer-json.c
+++ b/sapi/fuzzer/fuzzer-json.c
@@ -28,13 +28,9 @@
 #include <stdlib.h>
 
 #include "fuzzer-sapi.h"
-
-#ifdef HAVE_JSON
 #include "ext/json/php_json_parser.h"
-#endif
 
 int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
-#ifdef HAVE_JSON
 	char *data = malloc(Size+1);
 	memcpy(data, Data, Size);
 	data[Size] = '\0';
@@ -55,10 +51,6 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
 	php_request_shutdown(NULL);
 
 	free(data);
-#else
-	fprintf(stderr, "\n\nERROR:\nPHP built without JSON, recompile with --enable-json to use this fuzzer\n");
-	exit(1);
-#endif
 	return 0;
 }