summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/zend_object_handlers.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 8f2b1e9502..fc7770191d 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -819,7 +819,9 @@ static int zend_std_has_property(zval *object, zval *member, int check_empty TSR
if (check_empty) {
result = zend_is_true(*value);
} else {
- result = (Z_TYPE_PP(value) != IS_NULL);
+ /* We do not need to check for NULL here because this is not called for isset/isempty.
+ * And indeed even a NULL value means the property is defined. */
+ result = 1;
}
} else {
result = 0;