Merge branch 'PHP-8.6'

* PHP-8.6:
  JSON fuzzer: use options for handling invalid UTF-8 and big strings (#23877)

Author: DanielEScherzer

sapi/fuzzer/fuzzer-json.c

@@ -24,6 +24,7 @@
 #include <stdlib.h>
 
 #include "fuzzer-sapi.h"
+#include "ext/json/php_json.h"
 #include "ext/json/php_json_parser.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
@@ -36,10 +37,25 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
 	memcpy(data, Data, Size);
 	data[Size] = '\0';
 
-	for (int option = 0; option <=1; ++option) {
+	int options[12] = {
+		0,
+		PHP_JSON_OBJECT_AS_ARRAY,
+		PHP_JSON_OBJECT_AS_ARRAY | PHP_JSON_BIGINT_AS_STRING,
+		PHP_JSON_OBJECT_AS_ARRAY | PHP_JSON_BIGINT_AS_STRING | PHP_JSON_INVALID_UTF8_IGNORE,
+		PHP_JSON_OBJECT_AS_ARRAY | PHP_JSON_BIGINT_AS_STRING | PHP_JSON_INVALID_UTF8_SUBSTITUTE,
+		PHP_JSON_OBJECT_AS_ARRAY | PHP_JSON_INVALID_UTF8_IGNORE,
+		PHP_JSON_OBJECT_AS_ARRAY | PHP_JSON_INVALID_UTF8_SUBSTITUTE,
+		PHP_JSON_BIGINT_AS_STRING,
+		PHP_JSON_BIGINT_AS_STRING | PHP_JSON_INVALID_UTF8_IGNORE,
+		PHP_JSON_BIGINT_AS_STRING | PHP_JSON_INVALID_UTF8_SUBSTITUTE,
+		PHP_JSON_INVALID_UTF8_IGNORE,
+		PHP_JSON_INVALID_UTF8_SUBSTITUTE
+	};
+
+	for (int index = 0; index < 12; ++index) {
 		zval result;
 		php_json_parser parser;
-		php_json_parser_init(&parser, &result, data, Size, option, 10);
+		php_json_parser_init(&parser, &result, data, Size, options[index], 10);
 		if (php_json_yyparse(&parser) == SUCCESS) {
 			zval_ptr_dtor(&result);
 		}