php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disallow separation in a number of callbacks

Browse Source 
All of these clearly do not need separation support.
This commit is contained in:
Nikita Popov
2020-07-07 08:59:19 +02:00
parent b406b3d624
commit 632766a561
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/curl/interface.c
View File

@@ -1385,7 +1385,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
fci.retval = &retval;
fci.param_count = 2;
fci.params = argv;
fci.no_separation = 0;
fci.no_separation = 1;
ch->in_callback = 1;
error = zend_call_function(&fci, &t->fci_cache);
@@ -1432,7 +1432,7 @@ static int curl_fnmatch(void *ctx, const char *pattern, const char *string)
fci.retval = &retval;
fci.param_count = 3;
fci.params = argv;
fci.no_separation = 0;
fci.no_separation = 1;
ch->in_callback = 1;
error = zend_call_function(&fci, &t->fci_cache);
@@ -1485,7 +1485,7 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double
fci.retval = &retval;
fci.param_count = 5;
fci.params = argv;
fci.no_separation = 0;
fci.no_separation = 1;
ch->in_callback = 1;
error = zend_call_function(&fci, &t->fci_cache);
@@ -1541,7 +1541,7 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
fci.retval = &retval;
fci.param_count = 3;
fci.params = argv;
fci.no_separation = 0;
fci.no_separation = 1;
ch->in_callback = 1;
error = zend_call_function(&fci, &t->fci_cache);
@@ -1603,7 +1603,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
fci.retval = &retval;
fci.param_count = 2;
fci.params = argv;
fci.no_separation = 0;
fci.no_separation = 1;
ch->in_callback = 1;
error = zend_call_function(&fci, &t->fci_cache);

2
ext/dom/xpath.c
View File

@@ -151,7 +151,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
fci.object = NULL;
fci.retval = &retval;
fci.no_separation = 0;
fci.no_separation = 1;
if (!zend_make_callable(&fci.function_name, &callable)) {
php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", ZSTR_VAL(callable));

2
ext/pcre/php_pcre.c
View File

@@ -1529,7 +1529,7 @@ static zend_string *preg_do_repl_func(zend_fcall_info *fci, zend_fcall_info_cach
fci->retval = &retval;
fci->param_count = 1;
fci->params = &arg;
fci->no_separation = 0;
fci->no_separation = 1;
if (zend_call_function(fci, fcc) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
if (EXPECTED(Z_TYPE(retval) == IS_STRING)) {

2
ext/sqlite3/sqlite3.c
View File

@@ -2146,7 +2146,7 @@ static int php_sqlite3_authorizer(void *autharg, int action, const char *arg1, c
fci->retval = &retval;
fci->param_count = 5;
fci->params = argv;
fci->no_separation = 0;
fci->no_separation = 1;
int authreturn = SQLITE_DENY;

3
ext/xml/xml.c
View File

@@ -464,8 +464,7 @@ static void xml_call_handler(xml_parser *parser, zval *handler, zend_function *f
fci.retval = retval;
fci.param_count = argc;
fci.params = argv;
fci.no_separation = 0;
/*fci.function_handler_cache = &function_ptr;*/
fci.no_separation = 1;
result = zend_call_function(&fci, NULL);
if (result == FAILURE) {

3
ext/xsl/xsltprocessor.c
View File

@@ -245,8 +245,7 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t
ZVAL_COPY_VALUE(&fci.function_name, &handler);
fci.object = NULL;
fci.retval = &retval;
fci.no_separation = 0;
/*fci.function_handler_cache = &function_ptr;*/
fci.no_separation = 1;
if (!zend_make_callable(&handler, &callable)) {
if (!EG(exception)) {
php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", ZSTR_VAL(callable));