diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-31 18:16:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-31 18:16:08 +0800 |
| commit | 863a603fada3ce107cb402683bc79dce1359c463 (patch) | |
| tree | ae0426fb8fe168d56138464256b09f639d33176f /Zend/zend_execute_API.c | |
| parent | 238a3167e601dd74772182e354298578c1c50021 (diff) | |
| parent | 534dfa84a1347f88d92fdfe58d9cd5b3ddc41462 (diff) | |
| download | php-git-863a603fada3ce107cb402683bc79dce1359c463.tar.gz | |
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
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 308d54b31d..9e9bd841a0 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 */ |