Skip to content

Commit b795ce6

Browse files
committed
make overflow checks as unexpected
it's supposed to mark an error case
1 parent ad028eb commit b795ce6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Zend/zend_range_check.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939

4040
/* zend_long vs. (unsigned) int checks. */
4141
#ifdef ZEND_LONG_CAN_OVFL_INT
42-
# define ZEND_LONG_INT_OVFL(zlong) ((zlong) > (zend_long)INT_MAX)
43-
# define ZEND_LONG_INT_UDFL(zlong) ((zlong) < (zend_long)INT_MIN)
44-
# define ZEND_LONG_EXCEEDS_INT(zlong) (ZEND_LONG_INT_OVFL(zlong) || ZEND_LONG_INT_UDFL(zlong))
45-
# define ZEND_LONG_UINT_OVFL(zlong) ((zlong) < 0 || (zlong) > (zend_long)UINT_MAX)
42+
# define ZEND_LONG_INT_OVFL(zlong) UNEXPECTED((zlong) > (zend_long)INT_MAX)
43+
# define ZEND_LONG_INT_UDFL(zlong) UNEXPECTED((zlong) < (zend_long)INT_MIN)
44+
# define ZEND_LONG_EXCEEDS_INT(zlong) UNEXPECTED(ZEND_LONG_INT_OVFL(zlong) || ZEND_LONG_INT_UDFL(zlong))
45+
# define ZEND_LONG_UINT_OVFL(zlong) UNEXPECTED((zlong) < 0 || (zlong) > (zend_long)UINT_MAX)
4646
#else
4747
# define ZEND_LONG_INT_OVFL(zl) (0)
4848
# define ZEND_LONG_INT_UDFL(zl) (0)
@@ -51,9 +51,9 @@
5151
#endif
5252

5353
/* size_t vs (unsigned) int checks. */
54-
#define ZEND_SIZE_T_INT_OVFL(size) ((size) > (size_t)INT_MAX)
54+
#define ZEND_SIZE_T_INT_OVFL(size) UNEXPECTED((size) > (size_t)INT_MAX)
5555
#ifdef ZEND_SIZE_T_CAN_OVFL_UINT
56-
# define ZEND_SIZE_T_UINT_OVFL(size) ((size) > (size_t)UINT_MAX)
56+
# define ZEND_SIZE_T_UINT_OVFL(size) UNEXPECTED((size) > (size_t)UINT_MAX)
5757
#else
5858
# define ZEND_SIZE_T_UINT_OVFL(size) (0)
5959
#endif

0 commit comments

Comments
 (0)