diff options
| author | Zeev Suraski <zeev@php.net> | 1999-05-24 16:48:01 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-05-24 16:48:01 +0000 |
| commit | e115fdc6d606b146ab13aa6b27a870ff0f8fe24a (patch) | |
| tree | a52236dcfde2505a4a5f7cf3707ead27b0d8c024 /Zend/zend_operators.c | |
| parent | cbcd462d460c85c90f1bd356c2ea3b2f50658d79 (diff) | |
| download | php-git-e115fdc6d606b146ab13aa6b27a870ff0f8fe24a.tar.gz | |
The last fix was wrong
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 3a18e94b24..162a634162 100644 --- 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); \ } |