diff options
| author | Anatol Belski <ab@php.net> | 2015-08-26 21:03:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-08-26 21:12:41 +0200 |
| commit | b795ce6de54b303c51b3d6f6437ed981afd9fd57 (patch) | |
| tree | 57e67d313482a25c4141f22745a4517377d166dc | |
| parent | ad028ebc1158ad88b85e217078fa372fe82f8094 (diff) | |
| download | php-git-b795ce6de54b303c51b3d6f6437ed981afd9fd57.tar.gz | |
make overflow checks as unexpected
it's supposed to mark an error case
| -rw-r--r-- | Zend/zend_range_check.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_range_check.h b/Zend/zend_range_check.h index 5e44570614..44b094981d 100644 --- a/Zend/zend_range_check.h +++ b/Zend/zend_range_check.h @@ -39,10 +39,10 @@ /* zend_long vs. (unsigned) int checks. */ #ifdef ZEND_LONG_CAN_OVFL_INT -# define ZEND_LONG_INT_OVFL(zlong) ((zlong) > (zend_long)INT_MAX) -# define ZEND_LONG_INT_UDFL(zlong) ((zlong) < (zend_long)INT_MIN) -# define ZEND_LONG_EXCEEDS_INT(zlong) (ZEND_LONG_INT_OVFL(zlong) || ZEND_LONG_INT_UDFL(zlong)) -# define ZEND_LONG_UINT_OVFL(zlong) ((zlong) < 0 || (zlong) > (zend_long)UINT_MAX) +# define ZEND_LONG_INT_OVFL(zlong) UNEXPECTED((zlong) > (zend_long)INT_MAX) +# define ZEND_LONG_INT_UDFL(zlong) UNEXPECTED((zlong) < (zend_long)INT_MIN) +# define ZEND_LONG_EXCEEDS_INT(zlong) UNEXPECTED(ZEND_LONG_INT_OVFL(zlong) || ZEND_LONG_INT_UDFL(zlong)) +# define ZEND_LONG_UINT_OVFL(zlong) UNEXPECTED((zlong) < 0 || (zlong) > (zend_long)UINT_MAX) #else # define ZEND_LONG_INT_OVFL(zl) (0) # define ZEND_LONG_INT_UDFL(zl) (0) @@ -51,9 +51,9 @@ #endif /* size_t vs (unsigned) int checks. */ -#define ZEND_SIZE_T_INT_OVFL(size) ((size) > (size_t)INT_MAX) +#define ZEND_SIZE_T_INT_OVFL(size) UNEXPECTED((size) > (size_t)INT_MAX) #ifdef ZEND_SIZE_T_CAN_OVFL_UINT -# define ZEND_SIZE_T_UINT_OVFL(size) ((size) > (size_t)UINT_MAX) +# define ZEND_SIZE_T_UINT_OVFL(size) UNEXPECTED((size) > (size_t)UINT_MAX) #else # define ZEND_SIZE_T_UINT_OVFL(size) (0) #endif |