Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 05:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINDOWSCODECS] Avoid buffer underflow in TiffFrameDecode_ReadTile. CORE-16796

Browse source
This commit is contained in:
Thomas Faber 2020-04-13 17:55:00 +02:00
parent 2b64d45377
commit f4a8d3d704
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dll/win32/windowscodecs/tiffformat.c
View file

@ -1164,6 +1164,21 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT
{
BYTE b = *src--;
#ifdef __REACTOS__
dst -= 4;
dst[2] = (b & 0x08) ? 0xff : 0; /* R */
dst[1] = (b & 0x04) ? 0xff : 0; /* G */
dst[0] = (b & 0x02) ? 0xff : 0; /* B */
dst[3] = (b & 0x01) ? 0xff : 0; /* A */
if (count || This->decode_info.tile_width % 2 == 0)
{
dst -= 4;
dst[2] = (b & 0x80) ? 0xff : 0; /* R */
dst[1] = (b & 0x40) ? 0xff : 0; /* G */
dst[0] = (b & 0x20) ? 0xff : 0; /* B */
dst[3] = (b & 0x10) ? 0xff : 0; /* A */
}
#else
dst -= 8;
dst[2] = (b & 0x80) ? 0xff : 0; /* R */
dst[1] = (b & 0x40) ? 0xff : 0; /* G */
@ -1173,6 +1188,7 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT
dst[5] = (b & 0x04) ? 0xff : 0; /* G */
dst[4] = (b & 0x02) ? 0xff : 0; /* B */
dst[7] = (b & 0x01) ? 0xff : 0; /* A */
#endif
}
}
/* 16bpp RGBA */