Skip to content

Commit 6cef9d3

Browse files
committed
Merge branch 'phar-big-endian-8.2' into PHP-8.2
* phar-big-endian-8.2: Cast big endian byte shuffling to uint
2 parents 0bdc4b8 + 792a0e6 commit 6cef9d3

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
@@ -457,14 +457,14 @@ void phar_entry_remove(phar_entry_data *idata, char **error) /* {{{ */
457457

458458
#ifdef WORDS_BIGENDIAN
459459
# define PHAR_GET_32(buffer, var) \
460-
var = ((((unsigned char*)(buffer))[3]) << 24) \
461-
| ((((unsigned char*)(buffer))[2]) << 16) \
462-
| ((((unsigned char*)(buffer))[1]) << 8) \
463-
| (((unsigned char*)(buffer))[0]); \
460+
var = ((uint32_t)(((unsigned char*)(buffer))[3]) << 24) \
461+
| ((uint32_t)(((unsigned char*)(buffer))[2]) << 16) \
462+
| ((uint32_t)(((unsigned char*)(buffer))[1]) << 8) \
463+
| ((uint32_t)((unsigned char*)(buffer))[0]); \
464464
(buffer) += 4
465465
# define PHAR_GET_16(buffer, var) \
466-
var = ((((unsigned char*)(buffer))[1]) << 8) \
467-
| (((unsigned char*)(buffer))[0]); \
466+
var = ((uint16_t)(((unsigned char*)(buffer))[1]) << 8) \
467+
| ((uint16_t)((unsigned char*)(buffer))[0]); \
468468
(buffer) += 2
469469
#else
470470
# define PHAR_GET_32(buffer, var) \

0 commit comments

Comments
 (0)