com php-src: Fixes for sizeof int: Zend/zend_operators.c Zend/zend_operators.h

From: Date: Wed, 16 Oct 2013 09:57:39 +0000
Subject: com php-src: Fixes for sizeof int: Zend/zend_operators.c Zend/zend_operators.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73498@lists.php.net to get a copy of this message
Commit: 6a16702e30e4679379e1ca485322d8024b880400 Author: Anatol Belski <ab@php.net> Thu, 18 Jul 2013 02:58:55 -0700 Parents: f7730bd47e2509821c1fbf463362f74e24304292 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a16702e30e4679379e1ca485322d8024b880400 Log: Fixes for sizeof int Changed paths: M Zend/zend_operators.c M Zend/zend_operators.h Diff: diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 35d7aad..0e3306b 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -2229,7 +2229,7 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2) /* {{{ */ if ((ret1=is_numeric_string_ex(Z_STRVAL_P(s1), Z_STRSIZE_P(s1), &lval1, &dval1, 0, &oflow1)) && (ret2=is_numeric_string_ex(Z_STRVAL_P(s2), Z_STRSIZE_P(s2), &lval2, &dval2, 0, &oflow2))) { -#if ULONG_MAX == 0xFFFFFFFF +#if ZEND_UINT_MAX == 0xFFFFFFFF if (oflow1 != 0 && oflow1 == oflow2 && dval1 - dval2 == 0. && ((oflow1 == 1 && dval1 > 9007199254740991. /*0x1FFFFFFFFFFFFF*/) || (oflow1 == -1 && dval1 < -9007199254740991.))) { diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index a2fd016..1484c7a 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -201,7 +201,7 @@ check_digits: dp_or_e = -1; goto process_double; } - } else if (!(digits < SIZEOF_LONG * 2 || (digits == SIZEOF_LONG * 2 && ptr[-digits] <= '7'))) { + } else if (!(digits < SIZEOF_ZEND_INT * 2 || (digits == SIZEOF_ZEND_INT * 2 && ptr[-digits] <= '7'))) { if (dval) { local_dval = zend_hex_strtod(str, &ptr); } @@ -544,9 +544,9 @@ static zend_always_inline int fast_increment_function(zval *op1) "n"(ZVAL_OFFSETOF_TYPE) : "cc"); #else - if (UNEXPECTED(Z_LVAL_P(op1) == LONG_MAX)) { + if (UNEXPECTED(Z_LVAL_P(op1) == ZEND_INT_MAX)) { /* switch to double */ - Z_DVAL_P(op1) = (double)LONG_MAX + 1.0; + Z_DVAL_P(op1) = (double)ZEND_INT_MAX + 1.0; Z_TYPE_P(op1) = IS_DOUBLE; } else { Z_LVAL_P(op1)++;

« previous php.cvs (#73498) next »