com php-src: Avoid NULL dereference: Zend/zend_execute.c
| From: | Dmitry Stogov | Date: | Fri, 13 Jan 2017 09:51:23 +0000 |
| Subject: | com php-src: Avoid NULL dereference: Zend/zend_execute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96711@lists.php.net to get a copy of this message | ||
Commit: 1a8ad8ac27dae09cb1e1bdc02d3447feda14a48e
Author: Dmitry Stogov <dmitry@zend.com> Fri, 13 Jan 2017 12:51:23 +0300
Parents: 141d1ba9801f742dc5d9ccd06e02b94284c4deb7
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a8ad8ac27dae09cb1e1bdc02d3447feda14a48e
Log:
Avoid NULL dereference
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index ad788af..313593b 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2984,7 +2984,9 @@ ZEND_API zval *zend_get_zval_ptr(int op_type, const znode_op *node, const
zend_e
ZEND_API void ZEND_FASTCALL zend_check_internal_arg_type(zend_function *zf, uint32_t arg_num, zval
*arg)
{
- zend_verify_arg_type(zf, arg_num, arg, NULL, NULL);
+ void *dummy_cache_slot = NULL;
+
+ zend_verify_arg_type(zf, arg_num, arg, NULL, &dummy_cache_slot);
}
ZEND_API int ZEND_FASTCALL zend_check_arg_type(zend_function *zf, uint32_t arg_num, zval *arg, zval
*default_value, void **cache_slot)