diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-07-05 02:28:00 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-07-05 02:28:00 +0300 |
| commit | 6c0ddcda47732f559eac270daafbef94562db6b9 (patch) | |
| tree | a564a49f0f7e02cbbed559d16b7a35f2c010cd4a /Zend/zend_operators.c | |
| parent | 5898583e94462a6808b981b06dece2316979c8c1 (diff) | |
| download | php-git-6c0ddcda47732f559eac270daafbef94562db6b9.tar.gz | |
Removed legacy zval_dtor() usage. It doesn't work with zvals with refcount == 0, anyway.
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 1cf1e7fbc3..9208a88cd7 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1933,15 +1933,10 @@ ZEND_API int ZEND_FASTCALL numeric_compare_function(zval *op1, zval *op2) /* {{{ } /* }}} */ -static inline void zend_free_obj_get_result(zval *op) /* {{{ */ +static zend_always_inline void zend_free_obj_get_result(zval *op) /* {{{ */ { - if (Z_REFCOUNTED_P(op)) { - if (Z_REFCOUNT_P(op) == 0) { - zval_dtor(op); - } else { - zval_ptr_dtor(op); - } - } + ZEND_ASSERT(!Z_REFCOUNTED_P(op) || Z_REFCOUNT_P(op) != 0); + zval_ptr_dtor(op); } /* }}} */ |