clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix spurious failures of php-fuzz-mbstring

Browse Source
This commit is contained in:
Alex Dowad 2023-11-28 20:29:12 +02:00
parent f1bc43b418
commit 175b438abe
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sapi/fuzzer/fuzzer-mbstring.c
View File

@ -111,7 +111,17 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
if (FromEncoding->check != NULL) {
bool good = FromEncoding->check((unsigned char*)Data, Size);
if (errors1 > 0) {
ZEND_ASSERT(!good);
/* If the conversion function emits an error marker, that may or may not mean the input
* was invalid; it could also be that the input was valid, but it contains codepoints
* which cannot be represented in the output encoding.
* To confirm if that is the case, try converting to UTF-8, which can represent any
* Unicode codepoint. */
unsigned int errors3 = 0;
zend_string *Temp = convert_encoding(Data, Size, FromEncoding, &mbfl_encoding_utf8, 128, &errors3);
if (errors3 > 0) {
ZEND_ASSERT(!good);
}
zend_string_release(Temp);
}
}