Skip to content

Fix mbregex fuzzer not being built and truncating its input #24720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yumasansansan wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −22
Open

Fix mbregex fuzzer not being built and truncating its input #24720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sapi/fuzzer/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ if test "$PHP_FUZZER" != "no"; then
fi
if test -n "$enable_mbstring" && test "$enable_mbstring" != "no"; then
PHP_FUZZER_TARGET([mbstring], [PHP_FUZZER_MBSTRING_OBJS])
if test -n "$enable_mbregex" && test "$enable_mbregex" != "no"; then
dnl mbregex is enabled by default, so enable_mbregex is usually unset here.
if test "$enable_mbregex" != "no"; then
PHP_FUZZER_TARGET([mbregex], [PHP_FUZZER_MBREGEX_OBJS])
fi
fi
Expand Down
33 changes: 12 additions & 21 deletions sapi/fuzzer/fuzzer-mbregex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,23 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
return 0;
}

char *args[2];
char *data = malloc(Size+1);
memcpy(data, Data, Size);
data[Size] = '\0';

fuzzer_setup_dummy_frame();

args[0] = data;
args[1] = "test123";
fuzzer_call_php_func("mb_ereg", 2, args);

args[0] = data;
args[1] = "test123";
fuzzer_call_php_func("mb_eregi", 2, args);
/* Pass the input with its length, as strlen() would cut it off at the first NUL byte. */
zval args[2];
ZVAL_STRINGL(&args[0], (const char *) Data, Size);
ZVAL_STRING(&args[1], "test123");
fuzzer_call_php_func_zval("mb_ereg", 2, args);
fuzzer_call_php_func_zval("mb_eregi", 2, args);
zval_ptr_dtor(&args[1]);

args[0] = data;
args[1] = data;
fuzzer_call_php_func("mb_ereg", 2, args);

args[0] = data;
args[1] = data;
fuzzer_call_php_func("mb_eregi", 2, args);
ZVAL_COPY(&args[1], &args[0]);
fuzzer_call_php_func_zval("mb_ereg", 2, args);
fuzzer_call_php_func_zval("mb_eregi", 2, args);
zval_ptr_dtor(&args[0]);
zval_ptr_dtor(&args[1]);

fuzzer_request_shutdown();

free(data);
#else
fprintf(stderr, "\n\nERROR:\nPHP built without mbstring, recompile with --enable-mbstring to use this fuzzer\n");
exit(1);
Expand Down
Loading