diff options
| author | Pedro Magalhães <mail@pmmaga.net> | 2017-07-23 14:41:50 +0200 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-07-27 09:25:38 -0400 |
| commit | 34e5d3a87d0b0a01578754b646f50d01a087ba7c (patch) | |
| tree | acd86fa28efb47da1348c131441279d6c1862f8c | |
| parent | 9fcfe52d03bc40cfce8306debe2e91d83a560683 (diff) | |
| download | php-git-34e5d3a87d0b0a01578754b646f50d01a087ba7c.tar.gz | |
Simpler fix for #74974
| -rw-r--r-- | Zend/zend_operators.c | 20 | ||||
| -rw-r--r-- | Zend/zend_portability.h | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index c6d22fe37d..3a8929b83f 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -2151,16 +2151,6 @@ ZEND_API int ZEND_FASTCALL is_not_equal_function(zval *result, zval *op1, zval * ZEND_API int ZEND_FASTCALL is_smaller_function(zval *result, zval *op1, zval *op2) /* {{{ */ { - if (UNEXPECTED((Z_TYPE_P(op1) == IS_DOUBLE) && zend_isnan(Z_DVAL_P(op1)))) { - ZVAL_FALSE(result); - return SUCCESS; - } - - if (UNEXPECTED((Z_TYPE_P(op2) == IS_DOUBLE) && zend_isnan(Z_DVAL_P(op2)))) { - ZVAL_FALSE(result); - return SUCCESS; - } - if (compare_function(result, op1, op2) == FAILURE) { return FAILURE; } @@ -2171,16 +2161,6 @@ ZEND_API int ZEND_FASTCALL is_smaller_function(zval *result, zval *op1, zval *op ZEND_API int ZEND_FASTCALL is_smaller_or_equal_function(zval *result, zval *op1, zval *op2) /* {{{ */ { - if (UNEXPECTED((Z_TYPE_P(op1) == IS_DOUBLE) && isnan(Z_DVAL_P(op1)))) { - ZVAL_FALSE(result); - return SUCCESS; - } - - if (UNEXPECTED((Z_TYPE_P(op2) == IS_DOUBLE) && isnan(Z_DVAL_P(op2)))) { - ZVAL_FALSE(result); - return SUCCESS; - } - if (compare_function(result, op1, op2) == FAILURE) { return FAILURE; } diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index 9914621a49..b790e0c0dc 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -433,7 +433,7 @@ char *alloca(); #define ZEND_STRL(str) (str), (sizeof(str)-1) #define ZEND_STRS(str) (str), (sizeof(str)) #define ZEND_NORMALIZE_BOOL(n) \ - ((n) ? (((n)>0) ? 1 : -1) : 0) + ((n) ? (((n)<0) ? -1 : 1) : 0) #define ZEND_TRUTH(x) ((x) ? 1 : 0) #define ZEND_LOG_XOR(a, b) (ZEND_TRUTH(a) ^ ZEND_TRUTH(b)) |