Skip to content

Commit 07377de

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Cast big endian byte shuffling to uint
2 parents cf0a44a + 22d25d2 commit 07377de

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ext/phar/phar.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -459,14 +459,14 @@ void phar_entry_remove(phar_entry_data *idata, char **error) /* {{{ */
459459

460460
#ifdef WORDS_BIGENDIAN
461461
# define PHAR_GET_32(buffer, var) \
462-
var = ((((unsigned char*)(buffer))[3]) << 24) \
463-
| ((((unsigned char*)(buffer))[2]) << 16) \
464-
| ((((unsigned char*)(buffer))[1]) << 8) \
465-
| (((unsigned char*)(buffer))[0]); \
462+
var = ((uint32_t)(((unsigned char*)(buffer))[3]) << 24) \
463+
| ((uint32_t)(((unsigned char*)(buffer))[2]) << 16) \
464+
| ((uint32_t)(((unsigned char*)(buffer))[1]) << 8) \
465+
| ((uint32_t)((unsigned char*)(buffer))[0]); \
466466
(buffer) += 4
467467
# define PHAR_GET_16(buffer, var) \
468-
var = ((((unsigned char*)(buffer))[1]) << 8) \
469-
| (((unsigned char*)(buffer))[0]); \
468+
var = ((uint16_t)(((unsigned char*)(buffer))[1]) << 8) \
469+
| ((uint16_t)((unsigned char*)(buffer))[0]); \
470470
(buffer) += 2
471471
#else
472472
# define PHAR_GET_32(buffer, var) \

0 commit comments

Comments
 (0)