com php-fuzzing-sapi: Use call_user_function - it's simpler: fuzzer-sapi.c
| From: | Johannes Schlüter | Date: | Tue, 12 Mar 2019 05:57:26 +0000 |
| Subject: | com php-fuzzing-sapi: Use call_user_function - it's simpler: fuzzer-sapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105120@lists.php.net to get a copy of this message | ||
Commit: 13e0061f7ec0d3ef0e0f1c95d510ffc304302bda
Author: Stanislav Malyshev <smalyshev@gmail.com> Mon, 11 Mar 2019 22:57:26 -0700
Parents: f134133bf2270a0ef717e79d35cdc52f78e15237
Branches: master
Link: http://git.php.net/?p=php-fuzzing-sapi.git;a=commitdiff;h=13e0061f7ec0d3ef0e0f1c95d510ffc304302bda
Log:
Use call_user_function - it's simpler
Changed paths:
M fuzzer-sapi.c
Diff:
diff --git a/fuzzer-sapi.c b/fuzzer-sapi.c
index 9f6b833..70b276c 100644
--- a/fuzzer-sapi.c
+++ b/fuzzer-sapi.c
@@ -207,21 +207,13 @@ int fuzzer_do_request_d(char *filename, char *data, size_t data_len)
// Call named PHP function with N zval arguments
void fuzzer_call_php_func_zval(const char *func_name, int nargs, zval *args) {
- zend_fcall_info fci = {0};
- zend_fcall_info_cache fci_cache = {0};
zval retval, func;
int result;
ZVAL_STRING(&func, func_name);
ZVAL_UNDEF(&retval);
- zend_fcall_info_init(&func, 0, &fci, &fci_cache, NULL, NULL);
+ result = call_user_function(CG(function_table), NULL, &func, &retval, nargs, args);
- fci.retval = &retval;
- fci.param_count = nargs;
- fci.params = args;
- fci.no_separation = 0;
-
- result = zend_call_function(&fci, &fci_cache);
// TODO: check result?
/* to ensure retval is not broken */
php_var_dump(&retval, 0);