diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-23 16:53:54 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-23 16:53:54 +0200 |
| commit | 6276dd826b30c91bb95fc59846794617f9b4dd64 (patch) | |
| tree | 95640cd7b7dfb1d9c6be5b1e3d56d19e53ce55c6 /Zend/zend_objects.c | |
| parent | 3a104c3c3736cc7b9fc0190477b0d631032b3d80 (diff) | |
| download | php-git-6276dd826b30c91bb95fc59846794617f9b4dd64.tar.gz | |
Use ZEND_TYPE_IS_SET() when checking for property types
Instead of a simple if or 0 comparison. This would no longer work
if zend_type is a struct.
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index fb1a94f747..04172e31e5 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -63,7 +63,7 @@ ZEND_API void zend_object_std_dtor(zend_object *object) if (UNEXPECTED(Z_ISREF_P(p)) && (ZEND_DEBUG || ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(p)))) { zend_property_info *prop_info = zend_get_property_info_for_slot(object, p); - if (prop_info->type) { + if (ZEND_TYPE_IS_SET(prop_info->type)) { ZEND_REF_DEL_TYPE_SOURCE(Z_REF_P(p), prop_info); } } @@ -214,7 +214,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object, if (UNEXPECTED(Z_ISREF_P(dst)) && (ZEND_DEBUG || ZEND_REF_HAS_TYPE_SOURCES(Z_REF_P(dst)))) { zend_property_info *prop_info = zend_get_property_info_for_slot(new_object, dst); - if (prop_info->type) { + if (ZEND_TYPE_IS_SET(prop_info->type)) { ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(dst), prop_info); } } |