summaryrefslogtreecommitdiff
path: root/Zend/zend.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2004-04-17 14:02:40 +0000
committerMarcus Boerger <helly@php.net>2004-04-17 14:02:40 +0000
commitd58fe0357d1f153309e1883d83616a106ed5a4eb (patch)
tree8835d0e83b7683f95d108dd233fde105972fd403 /Zend/zend.c
parent57049aff266b499aa026f153ac218cddf86d9517 (diff)
downloadphp-git-d58fe0357d1f153309e1883d83616a106ed5a4eb.tar.gz
Retval may not be set when zend_execute() is overloaded
Diffstat (limited to 'Zend/zend.c')
-rw-r--r--Zend/zend.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index 2ca28c4773..8e928fb996 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1092,7 +1092,7 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co
zval_ptr_dtor(EG(return_value_ptr_ptr));
local_retval = NULL;
}
- } else if (!retval) {
+ } else if (!retval && *EG(return_value_ptr_ptr)) {
zval_ptr_dtor(EG(return_value_ptr_ptr));
local_retval = NULL;
}