diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-16 21:55:08 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-16 21:55:08 +0200 |
| commit | 71675a4bf830d7b9400663275fe48275480d34f4 (patch) | |
| tree | 8ce9b1fdda30d26121334fb5c228df7884f6f7c2 /Zend/zend_execute_API.c | |
| parent | f72d6f97ecf976f00abc0dc21b5d1ef4838de60a (diff) | |
| parent | 8b66d64b2343bc4fd8aeabb690024edb850a0155 (diff) | |
| download | php-git-71675a4bf830d7b9400663275fe48275480d34f4.tar.gz | |
Merge remote-tracking branch 'php-src/phpng' into ast
Conflicts:
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_language_parser.y
Incomplete merge!
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index bdf87bd440..947d051ddd 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -859,6 +859,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS EG(scope) = func->common.scope; } call->prev_execute_data = EG(current_execute_data); + call->return_value = NULL; /* this is not a constructor call */ EG(current_execute_data) = call; if (EXPECTED(zend_execute_internal == NULL)) { /* saves one function call if zend_execute_internal is not used */ |