archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Cast big endian byte shuffling to uint
This commit is contained in:
Calvin Buckley 2024-09-24 02:23:51 -03:00
commit 22d25d2896
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/phar/phar.c
View file

@ -457,14 +457,14 @@ void phar_entry_remove(phar_entry_data *idata, char **error) /* {{{ */
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
# define PHAR_GET_32(buffer, var) \ # define PHAR_GET_32(buffer, var) \
var = ((((unsigned char*)(buffer))[3]) << 24) \ var = ((uint32_t)(((unsigned char*)(buffer))[3]) << 24) \
| ((((unsigned char*)(buffer))[2]) << 16) \ | ((uint32_t)(((unsigned char*)(buffer))[2]) << 16) \
| ((((unsigned char*)(buffer))[1]) << 8) \ | ((uint32_t)(((unsigned char*)(buffer))[1]) << 8) \
| (((unsigned char*)(buffer))[0]); \ | ((uint32_t)((unsigned char*)(buffer))[0]); \
(buffer) += 4 (buffer) += 4
# define PHAR_GET_16(buffer, var) \ # define PHAR_GET_16(buffer, var) \
var = ((((unsigned char*)(buffer))[1]) << 8) \ var = ((uint16_t)(((unsigned char*)(buffer))[1]) << 8) \
| (((unsigned char*)(buffer))[0]); \ | ((uint16_t)((unsigned char*)(buffer))[0]); \
(buffer) += 2 (buffer) += 2
#else #else
# define PHAR_GET_32(buffer, var) \ # define PHAR_GET_32(buffer, var) \