Skip to content

Commit

Permalink
Fix bug #25038
Browse files Browse the repository at this point in the history
  • Loading branch information
zsuraski committed Feb 11, 2004
1 parent 5731108 commit 7539079
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions Zend/zend_execute_API.c
Expand Up @@ -551,9 +551,18 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
if (EG(current_execute_data)) {
execute_data = *EG(current_execute_data);
} else {
/* This only happens when we're called outside any execute()'s
* It shouldn't be strictly necessary to NULL execute_data out,
* but it may make bugs easier to spot
*/
memset(&execute_data, 0, sizeof(zend_execute_data));
}

/* we may return SUCCESS, and yet retval may be uninitialized,
* if there was an exception...
*/
*fci->retval_ptr_ptr = NULL;

if (!fci_cache || !fci_cache->initialized) {
if (fci->function_name->type==IS_ARRAY) { /* assume array($obj, $name) couple */
zval **tmp_object_ptr, **tmp_real_function_name;
Expand Down

0 comments on commit 7539079

Please sign in to comment.