GRAPHICS: Fix PICT buffer overflow

This commit is contained in:
Matthew Hoops 2011-10-07 11:11:00 -04:00
parent 172e97da15
commit deab5b2875

View File

@ -337,7 +337,11 @@ void PictDecoder::unpackBitsRect(Common::SeekableReadStream *stream, bool hasPal
_outputSurface = new Graphics::Surface();
_outputSurface->create(width, height, (bytesPerPixel == 1) ? PixelFormat::createFormatCLUT8() : _pixelFormat);
byte *buffer = new byte[width * height * bytesPerPixel];
// Create an temporary buffer, but allocate a bit more than we need to avoid overflow
// (align it to the next highest two-byte packed boundary, which may be more unpacked,
// as m68k and therefore QuickDraw is word-aligned)
byte *buffer = new byte[width * height * bytesPerPixel + (8 * 2 / packBitsData.pixMap.pixelSize)];
// Read in amount of data per row
for (uint16 i = 0; i < packBitsData.pixMap.bounds.height(); i++) {