mirror of
https://github.com/php/php-src.git
synced 2024-11-29 21:04:10 +08:00
- Revert Fixed bug #30228 (crash when comparing SimpleXML attribute to a boolean).
- Need to discuss where the real problem is.
This commit is contained in:
parent
47a4a96d23
commit
a4dff681c8
@ -1323,11 +1323,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
|
||||
|
||||
if (op1->type == IS_BOOL || op2->type == IS_BOOL
|
||||
|| op1->type == IS_NULL || op2->type == IS_NULL) {
|
||||
if (free_op1) {
|
||||
convert_to_boolean(op1);
|
||||
} else {
|
||||
zendi_convert_to_boolean(op1, op1_copy, result);
|
||||
}
|
||||
zendi_convert_to_boolean(op1, op1_copy, result);
|
||||
zendi_convert_to_boolean(op2, op2_copy, result);
|
||||
result->type = IS_LONG;
|
||||
result->value.lval = ZEND_NORMALIZE_BOOL(op1->value.lval-op2->value.lval);
|
||||
|
Loading…
Reference in New Issue
Block a user