com php-src: execute_data->return_value should be i nitialized when call internal constructors: Zend/ze nd_execute_API.c
| From: | Dmitry Stogov | Date: | Thu, 31 Jul 2014 06:51:49 +0000 |
| Subject: | com php-src: execute_data->return_value should be i nitialized when call internal constructors: Zend/ze nd_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79692@lists.php.net to get a copy of this message | ||
Commit: c201ba8fffd967b9cc5dcf18bd46cc9d025cb955
Author: Dmitry Stogov <dmitry@zend.com> Thu, 31 Jul 2014 10:51:49 +0400
Parents: f693cf8e66ca29625dc04a587263f7f03c066e53
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c201ba8fffd967b9cc5dcf18bd46cc9d025cb955
Log:
execute_data->return_value should be initialized when call internal constructors
Changed paths:
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 308d54b..9e9bd84 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 */