The last fix was wrong

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 3a18e94b242c9725ce40cd9a86ceb86e27691715..162a63416241906b97a65b2b26d3c5e5ee1d64b5 100644 (file)
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -66,16 +66,15 @@ ZEND_API void convert_scalar_to_number(zval *op)
                        case IS_BC: \
                                (holder).type = IS_DOUBLE; /* may have lost significant digits */ \
                                break; \
-                       case IS_RESOURCE: \
-                       case IS_BOOL: \
-                               (holder).type = IS_LONG; \
-                               break; \
                        default: \
                                (holder).value.lval = strtol((op)->value.str.val, NULL, 10); \
                                (holder).type = IS_LONG; \
                                break; \
                } \
                (op) = &(holder); \
+       } else if ((op)->type==IS_BOOL || (op)->type==IS_RESOURCE) { \
+               (holder).type = IS_LONG; \
+               (op) = &(holder); \
        }