mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid reading invalid images in doc::read_image()

Browse Source
This commit is contained in:
David Capello 2015-04-10 11:26:36 -03:00
parent 8353e45ae8
commit 045ece4114
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/doc/image_io.cpp
View File

@ -99,6 +99,14 @@ Image* read_image(std::istream& is, bool setId)
int height = read16(is); // Height
uint32_t maskColor = read32(is); // Mask color
if ((pixelFormat != IMAGE_RGB &&
pixelFormat != IMAGE_GRAYSCALE &&
pixelFormat != IMAGE_INDEXED &&
pixelFormat != IMAGE_BITMAP) ||
(width < 1 || height < 1) ||
(width > 0xfffff || height > 0xfffff))
return nullptr;
base::UniquePtr<Image> image(Image::create(static_cast<PixelFormat>(pixelFormat), width, height));
int rowSize = image->getRowStrideSize();