mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix shift UB in php_ifd_get32s

Browse Source
This commit is contained in:
Nikita Popov 2019-06-19 15:03:22 +02:00
parent b1196e2128
commit 1c018af682
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ext/exif/exif.c
View File

@ -1457,28 +1457,29 @@ static signed short php_ifd_get16s(void *value, int motorola_intel)
/* }}} */
/* {{{ php_ifd_get32s
* Convert a 32 bit signed value from file's native byte order */
static int php_ifd_get32s(void *value, int motorola_intel)
* Convert a 32 bit unsigned value from file's native byte order */
static unsigned php_ifd_get32u(void *void_value, int motorola_intel)
{
uchar *value = (uchar *) void_value;
if (motorola_intel) {
return (((char *)value)[0] << 24)
| (((uchar *)value)[1] << 16)
| (((uchar *)value)[2] << 8 )
| (((uchar *)value)[3] );
return ((unsigned)value[0] << 24)
| ((unsigned)value[1] << 16)
| ((unsigned)value[2] << 8 )
| ((unsigned)value[3] );
} else {
return (((char *)value)[3] << 24)
| (((uchar *)value)[2] << 16)
| (((uchar *)value)[1] << 8 )
| (((uchar *)value)[0] );
return ((unsigned)value[3] << 24)
| ((unsigned)value[2] << 16)
| ((unsigned)value[1] << 8 )
| ((unsigned)value[0] );
}
}
/* }}} */
/* {{{ php_ifd_get32u
* Write 32 bit unsigned value to data */
static unsigned php_ifd_get32u(void *value, int motorola_intel)
* Convert a 32 bit signed value from file's native byte order */
static unsigned php_ifd_get32s(void *value, int motorola_intel)
{
return (unsigned)php_ifd_get32s(value, motorola_intel) & 0xffffffff;
return (int) php_ifd_get32u(value, motorola_intel);
}
/* }}} */