diff options
| author | Stanislav Malyshev <stas@php.net> | 2019-03-05 13:25:21 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2019-03-05 21:41:22 -0800 |
| commit | f90a1a472a67cbbcde163cca65bdc78c54ab358f (patch) | |
| tree | d80b1eaf064f6ff19f911401b7ef3e00870957df | |
| parent | 433fc322fc43e09279201bce43e0c465fc19378a (diff) | |
| download | php-git-f90a1a472a67cbbcde163cca65bdc78c54ab358f.tar.gz | |
Fix shifting signed values too far
Signed shift of 31 for int and 63 for long is flagged as undefined
behavior by UBSan (-fsanitize=undefined) and seems to be indeed so
according to the standard.
The patch converts such cases to use unsigned.
| -rw-r--r-- | Zend/zend_alloc.c | 4 | ||||
| -rw-r--r-- | Zend/zend_compile.h | 2 | ||||
| -rw-r--r-- | Zend/zend_cpuinfo.h | 2 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_cfg.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 2165c532f5..83eee90312 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -587,12 +587,12 @@ static zend_always_inline int zend_mm_bitset_is_set(zend_mm_bitset *bitset, int static zend_always_inline void zend_mm_bitset_set_bit(zend_mm_bitset *bitset, int bit) { - bitset[bit / ZEND_MM_BITSET_LEN] |= (Z_L(1) << (bit & (ZEND_MM_BITSET_LEN-1))); + bitset[bit / ZEND_MM_BITSET_LEN] |= (Z_UL(1) << (bit & (ZEND_MM_BITSET_LEN-1))); } static zend_always_inline void zend_mm_bitset_reset_bit(zend_mm_bitset *bitset, int bit) { - bitset[bit / ZEND_MM_BITSET_LEN] &= ~(Z_L(1) << (bit & (ZEND_MM_BITSET_LEN-1))); + bitset[bit / ZEND_MM_BITSET_LEN] &= ~(Z_UL(1) << (bit & (ZEND_MM_BITSET_LEN-1))); } static zend_always_inline void zend_mm_bitset_set_range(zend_mm_bitset *bitset, int start, int len) diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 37b1836a79..8e4e8f5ad9 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -325,7 +325,7 @@ typedef struct _zend_oparray_context { #define ZEND_ACC_DTOR (1 << 29) /* | X | | */ /* | | | */ /* op_array uses strict mode types | | | */ -#define ZEND_ACC_STRICT_TYPES (1 << 31) /* | X | | */ +#define ZEND_ACC_STRICT_TYPES (1U << 31) /* | X | | */ #define ZEND_ACC_PPP_MASK (ZEND_ACC_PUBLIC | ZEND_ACC_PROTECTED | ZEND_ACC_PRIVATE) diff --git a/Zend/zend_cpuinfo.h b/Zend/zend_cpuinfo.h index 36e14ba556..942f92c713 100644 --- a/Zend/zend_cpuinfo.h +++ b/Zend/zend_cpuinfo.h @@ -22,7 +22,7 @@ #include "zend.h" #define ZEND_CPU_EBX_MASK (1<<30) -#define ZEND_CPU_EDX_MASK (1<<31) +#define ZEND_CPU_EDX_MASK (1U<<31) typedef enum _zend_cpu_feature { /* ECX */ diff --git a/ext/opcache/Optimizer/zend_cfg.h b/ext/opcache/Optimizer/zend_cfg.h index 19a30ad40b..7d6ef25eee 100644 --- a/ext/opcache/Optimizer/zend_cfg.h +++ b/ext/opcache/Optimizer/zend_cfg.h @@ -35,7 +35,7 @@ #define ZEND_BB_LOOP_HEADER (1<<16) #define ZEND_BB_IRREDUCIBLE_LOOP (1<<17) -#define ZEND_BB_REACHABLE (1<<31) +#define ZEND_BB_REACHABLE (1U<<31) #define ZEND_BB_PROTECTED (ZEND_BB_ENTRY|ZEND_BB_RECV_ENTRY|ZEND_BB_TRY|ZEND_BB_CATCH|ZEND_BB_FINALLY|ZEND_BB_FINALLY_END|ZEND_BB_UNREACHABLE_FREE) @@ -92,7 +92,7 @@ typedef struct _zend_cfg { } zend_cfg; /* Build Flags */ -#define ZEND_RT_CONSTANTS (1<<31) +#define ZEND_RT_CONSTANTS (1U<<31) #define ZEND_CFG_STACKLESS (1<<30) #define ZEND_SSA_DEBUG_LIVENESS (1<<29) #define ZEND_SSA_DEBUG_PHI_PLACEMENT (1<<28) |