From: Zeev Suraski <zeev@php.net>
Date: Wed, 4 Feb 2004 23:48:39 +0000 (+0000)
Subject: Fix exceptions happening inside internal functions called through
X-Git-Tag: php-5.0.0b4RC1~121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e28ab687d23c723fc6048c14aaeeac89828b4023;p=php

Fix exceptions happening inside internal functions called through
zend_user_function()
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index fb2b2b7082..09cd8dc5b4 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -547,12 +547,11 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
 	}
 
 	/* Initialize execute_data */
-	EX(fbc) = NULL;
-	EX(object) = NULL;
-	EX(Ts) = NULL;
-	EX(op_array) = NULL;
-	EX(opline) = NULL;
-	*fci->retval_ptr_ptr = NULL;
+	if (EG(current_execute_data)) {
+		execute_data = *EG(current_execute_data);
+	} else {
+		memset(&execute_data, 0, sizeof(zend_execute_data));
+	}
 
 	if (!fci_cache || !fci_cache->initialized) {
 		if (fci->function_name->type==IS_ARRAY) { /* assume array($obj, $name) couple */