diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-04 11:07:22 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-04 11:07:22 +0100 |
| commit | a6832caac9678fce098064a62137bb88e1d7e236 (patch) | |
| tree | c7134adf3caee1dc8fc433a38ac261283cd682a1 /Zend/zend_inheritance.c | |
| parent | 7b34e30b9a77197e31bf4d41d1a705738183d660 (diff) | |
| download | php-git-a6832caac9678fce098064a62137bb88e1d7e236.tar.gz | |
Fix incorrect assertion in property type variance check
Only one of the status has to be UNRESOLVED, the other could also
be SUCCESS.
Fixes oss-fuzz #19108 and oss-fuzz #19111.
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 9b8a47f365..1a27bbdfb6 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -966,7 +966,7 @@ inheritance_status property_types_compatible( if (status1 == INHERITANCE_ERROR || status2 == INHERITANCE_ERROR) { return INHERITANCE_ERROR; } - ZEND_ASSERT(status1 == INHERITANCE_UNRESOLVED && status2 == INHERITANCE_UNRESOLVED); + ZEND_ASSERT(status1 == INHERITANCE_UNRESOLVED || status2 == INHERITANCE_UNRESOLVED); return INHERITANCE_UNRESOLVED; } |