Retval may not be set when zend_execute() is overloaded

diff --git a/Zend/zend.c b/Zend/zend.c
index 2ca28c4773ef0a819678ab8260063b3008e35b71..8e928fb996ec17cb60223a24e70a5d3a3a873c70 100644 (file)
--- 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;
                        }