summaryrefslogtreecommitdiff
path: root/Zend/zend_operators.c
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/zend_operators.c')
-rw-r--r--Zend/zend_operators.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index ffc4dcc9a2..3574ea7065 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -2174,6 +2174,16 @@ 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) && 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;
}
@@ -2184,6 +2194,16 @@ 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;
}