Skip to content

Commit

Permalink
Initialize named_params in some places
Browse files Browse the repository at this point in the history
  • Loading branch information
nikic committed Jul 6, 2020
1 parent 42e8df6 commit 5d37c34
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ext/curl/interface.c
Expand Up @@ -1390,6 +1390,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.named_params = NULL;
fci.no_separation = 0;

ch->in_callback = 1;
Expand Down Expand Up @@ -1438,6 +1439,7 @@ static int curl_fnmatch(void *ctx, const char *pattern, const char *string)
fci.retval = &retval;
fci.param_count = 3;
fci.params = argv;
fci.named_params = NULL;
fci.no_separation = 0;

ch->in_callback = 1;
Expand Down Expand Up @@ -1492,6 +1494,7 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double
fci.retval = &retval;
fci.param_count = 5;
fci.params = argv;
fci.named_params = NULL;
fci.no_separation = 0;

ch->in_callback = 1;
Expand Down Expand Up @@ -1549,6 +1552,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.named_params = NULL;
fci.no_separation = 0;

ch->in_callback = 1;
Expand Down Expand Up @@ -1612,6 +1616,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.named_params = NULL;
fci.no_separation = 0;

ch->in_callback = 1;
Expand Down
1 change: 1 addition & 0 deletions ext/pdo/pdo_dbh.c
Expand Up @@ -437,6 +437,7 @@ static void pdo_stmt_construct(zend_execute_data *execute_data, pdo_stmt_t *stmt
fci.retval = &retval;
fci.param_count = 0;
fci.params = NULL;
fci.named_params = NULL;
fci.no_separation = 1;

zend_fcall_info_args(&fci, ctor_args);
Expand Down
1 change: 1 addition & 0 deletions ext/spl/spl_directory.c
Expand Up @@ -1956,6 +1956,7 @@ static int spl_filesystem_file_call(spl_filesystem_object *intern, zend_function
fci.retval = return_value;
fci.param_count = num_args;
fci.params = params;
fci.named_params = NULL;
fci.no_separation = 1;
ZVAL_STR(&fci.function_name, func_ptr->common.function_name);

Expand Down
1 change: 1 addition & 0 deletions ext/spl/spl_engine.h
Expand Up @@ -63,6 +63,7 @@ static inline void spl_instantiate_arg_n(zend_class_entry *pce, zval *retval, in
fci.retval = &dummy;
fci.param_count = argc;
fci.params = argv;
fci.named_params = NULL;
fci.no_separation = 1;

fcc.function_handler = func;
Expand Down
1 change: 1 addition & 0 deletions main/streams/userspace.c
Expand Up @@ -308,6 +308,7 @@ static void user_stream_create_object(struct php_user_stream_wrapper *uwrap, php
fci.retval = &retval;
fci.param_count = 0;
fci.params = NULL;
fci.named_params = NULL;
fci.no_separation = 1;

fcc.function_handler = uwrap->ce->constructor;
Expand Down

0 comments on commit 5d37c34

Please sign in to comment.