diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-11-29 02:13:20 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-11-29 02:13:20 +0000 |
| commit | f90b877f4188dd24e0863456d175fc694a42f1c8 (patch) | |
| tree | 3ba58a66ba63d305c3aec43619242ed2431612a4 /Zend/zend_API.c | |
| parent | d19ce51854a94d9da3f5ff24ea965928ed520688 (diff) | |
| download | php-git-f90b877f4188dd24e0863456d175fc694a42f1c8.tar.gz | |
Refactor ZEND_LONG_MAX/MIN checks into ZEND_DOUBLE_FITS_LONG()
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 04d7f8a23f..57288c6709 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -407,7 +407,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons if (zend_isnan(d)) { return "long"; } - if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) { + if (!ZEND_DOUBLE_FITS_LONG(d)) { if (c == 'L') { *p = (d > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN; } 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))) { 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') { *p = (Z_DVAL_P(arg) > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN; } else { |