From b096eacdd1a00d2b8a1511539dbe77851bf25150 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 15 Aug 2017 14:46:18 +0300 Subject: [PATCH] Fixed possible incorrect result of type verification. --- Zend/zend_execute.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index a78accfb76..ae9d00684d 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -843,6 +843,7 @@ static zend_always_inline zend_bool zend_check_type( if (EXPECTED(Z_TYPE_P(arg) == IS_OBJECT)) { return instanceof_function(Z_OBJCE_P(arg), *ce); } + return Z_TYPE_P(arg) == IS_NULL && (ZEND_TYPE_ALLOW_NULL(type) || (default_value && is_null_constant(scope, default_value))); } else if (EXPECTED(ZEND_TYPE_CODE(type) == Z_TYPE_P(arg))) { return 1; } -- 2.40.0