diff options
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 4f0936192d..df8e933d81 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1305,20 +1305,18 @@ ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_ static inline void zend_free_obj_get_result(zval *op) { - if (op) { - if (Z_REFCOUNT_P(op) == 0) { - zval_dtor(op); - FREE_ZVAL(op); - } else { - zval_ptr_dtor(&op); - } + if (Z_REFCOUNT_P(op) == 0) { + zval_dtor(op); + FREE_ZVAL(op); + } else { + zval_ptr_dtor(&op); } } #define COMPARE_RETURN_AND_FREE(retval) \ - zend_free_obj_get_result(op1_free); \ - zend_free_obj_get_result(op2_free); \ - return retval; + if (op1_free) {zend_free_obj_get_result(op1_free);} \ + if (op2_free) {zend_free_obj_get_result(op2_free);} \ + return retval; ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) { |