archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactor ZEND_LONG_MAX/MIN checks into ZEND_DOUBLE_FITS_LONG()

Browse source
This commit is contained in:
Andrea Faulds 2014-11-29 02:13:20 +00:00
parent d19ce51854
commit f90b877f41
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_API.c
View file

@ -407,7 +407,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
if (zend_isnan(d)) { if (zend_isnan(d)) {
return "long"; return "long";
} }
if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) { if (!ZEND_DOUBLE_FITS_LONG(d)) {
if (c == 'L') { if (c == 'L') {
*p = (d > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN; *p = (d > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN;
} else { } else {
@ -425,7 +425,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
if (zend_isnan(Z_DVAL_P(arg))) { if (zend_isnan(Z_DVAL_P(arg))) {
return "long"; return "long";
} }
if (Z_DVAL_P(arg) > ZEND_LONG_MAX || Z_DVAL_P(arg) < ZEND_LONG_MIN) { if (!ZEND_DOUBLE_FITS_LONG(Z_DVAL_P(arg))) {
if (c == 'L') { if (c == 'L') {
*p = (Z_DVAL_P(arg) > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN; *p = (Z_DVAL_P(arg) > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN;
} else { } else {

4
Zend/zend_API.h
View file

@ -1067,7 +1067,7 @@ static zend_always_inline int _z_param_long(zval *arg, zend_long *dest, zend_boo
if (UNEXPECTED(zend_isnan(Z_DVAL_P(arg)))) { if (UNEXPECTED(zend_isnan(Z_DVAL_P(arg)))) {
return 0; return 0;
} }
if (UNEXPECTED(Z_DVAL_P(arg) > ZEND_LONG_MAX || Z_DVAL_P(arg) < ZEND_LONG_MIN)) { if (UNEXPECTED(!ZEND_DOUBLE_FITS_LONG(Z_DVAL_P(arg)))) {
/* Ironically, the strict parameter makes zpp *non*-strict here */ /* Ironically, the strict parameter makes zpp *non*-strict here */
if (strict) { if (strict) {
*dest = (Z_DVAL_P(arg) > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN; *dest = (Z_DVAL_P(arg) > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN;
@ -1086,7 +1086,7 @@ static zend_always_inline int _z_param_long(zval *arg, zend_long *dest, zend_boo
if (UNEXPECTED(zend_isnan(d))) { if (UNEXPECTED(zend_isnan(d))) {
return 0; return 0;
} }
if (UNEXPECTED(d > ZEND_LONG_MAX || d < ZEND_LONG_MIN)) { if (UNEXPECTED(!ZEND_DOUBLE_FITS_LONG(d))) {
if (strict) { if (strict) {
*dest = (d > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN; *dest = (d > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN;
} else { } else {

12
Zend/zend_operators.h
View file

@ -89,6 +89,13 @@ ZEND_API zend_uchar _is_numeric_string_ex(const char *str, size_t length, zend_l
END_EXTERN_C() END_EXTERN_C()
#if SIZEOF_ZEND_LONG == 4
# define ZEND_DOUBLE_FITS_LONG(d) (!((d) > ZEND_LONG_MAX || (d) < ZEND_LONG_MIN))
#else
/* >= as (double)ZEND_LONG_MAX is outside signed range */
# define ZEND_DOUBLE_FITS_LONG(d) (!((d) >= ZEND_LONG_MAX || (d) < ZEND_LONG_MIN))
#endif
#if ZEND_DVAL_TO_LVAL_CAST_OK #if ZEND_DVAL_TO_LVAL_CAST_OK
static zend_always_inline zend_long zend_dval_to_lval(double d) static zend_always_inline zend_long zend_dval_to_lval(double d)
{ {
@ -103,7 +110,7 @@ static zend_always_inline zend_long zend_dval_to_lval(double d)
{ {
if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) { if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
return 0; return 0;
} else if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) { } else if (!ZEND_DOUBLE_FITS_LONG(d)) {
double two_pow_32 = pow(2., 32.), double two_pow_32 = pow(2., 32.),
dmod; dmod;
@ -122,8 +129,7 @@ static zend_always_inline zend_long zend_dval_to_lval(double d)
{ {
if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) { if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
return 0; return 0;
/* >= as (double)ZEND_LONG_MAX is outside signed range */ } else if (!ZEND_DOUBLE_FITS_LONG(d)) {
} else if (d >= ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
double two_pow_64 = pow(2., 64.), double two_pow_64 = pow(2., 64.),
dmod; dmod;

4
ext/standard/tests/strings/chunk_split_variation2.phpt
View file

@ -100,8 +100,8 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli
bool(false) bool(false)
-- Iteration 3 -- -- Iteration 3 --
Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d Warning: chunk_split() expects parameter 2 to be long, double given in %s on line %d
bool(false) NULL
-- Iteration 4 -- -- Iteration 4 --
Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d