com php-src: Fix leak when dynamically calling abstract method: Zend/zend_API.c
| From: | Nikita Popov | Date: | Thu, 14 Jul 2016 16:39:08 +0000 |
| Subject: | com php-src: Fix leak when dynamically calling abstract method: Zend/zend_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93021@lists.php.net to get a copy of this message | ||
Commit: 00047fcf843fa5b99c1615b0d65502a43fada924
Author: Nikita Popov <nikic@php.net> Thu, 14 Jul 2016 17:36:56 +0200
Parents: 587668be564bd5ad11ca5d56a6480407c603f0c0
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=00047fcf843fa5b99c1615b0d65502a43fada924
Log:
Fix leak when dynamically calling abstract method
Changed paths:
M Zend/zend_API.c
Diff:
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index a488dba..3ba1783 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3106,7 +3106,7 @@ get_function_via_handler:
retval = 0;
} else {
zend_throw_error(NULL, "Cannot call abstract method %s::%s()",
ZSTR_VAL(fcc->calling_scope->name),
ZSTR_VAL(fcc->function_handler->common.function_name));
- return 0;
+ retval = 0;
}
} else if (!fcc->object && !(fcc->function_handler->common.fn_flags &
ZEND_ACC_STATIC)) {
int severity;