php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-08 16:43:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix bug 15037

Browse Source 
- Bump version to alpha2-dev
This commit is contained in:
Andi Gutmans
2002-06-29 07:35:41 +00:00
parent 8c49132266
commit 6339bd5912
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend.h
View File

@@ -22,7 +22,7 @@
#ifndef ZEND_H
#define ZEND_H
#define ZEND_VERSION "2.0.0-dev"
#define ZEND_VERSION "2.0.0-alpha2-dev"
#define ZEND_ENGINE_2

28
Zend/zend_operators.c
View File

@@ -1509,6 +1509,7 @@ ZEND_API int increment_function(zval *op1)
ZEND_API int decrement_function(zval *op1)
{
long lval;
double dval;
switch (op1->type) {
case IS_LONG:
@@ -1528,16 +1529,23 @@ ZEND_API int decrement_function(zval *op1)
op1->value.lval = -1;
op1->type = IS_LONG;
break;
} else if (is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, NULL, 0)==IS_LONG) { /* long */
STR_FREE(op1->value.str.val);
if(lval == LONG_MIN) {
double d = (double)lval;
ZVAL_DOUBLE(op1, d-1);
} else {
op1->value.lval = lval-1;
op1->type = IS_LONG;
}
break;
}
switch(is_numeric_string(op1->value.str.val, op1->value.str.len, &lval, &dval, 0)) {
case IS_LONG:
STR_FREE(op1->value.str.val);
if(lval == LONG_MIN) {
double d = (double)lval;
ZVAL_DOUBLE(op1, d-1);
} else {
op1->value.lval = lval-1;
op1->type = IS_LONG;
}
break;
case IS_DOUBLE:
STR_FREE(op1->value.str.val);
op1->value.dval = dval - 1;
op1->type = IS_DOUBLE;
break;
}
break;
default: