mirror of
https://github.com/aseprite/aseprite.git
synced 2025-04-09 18:44:46 +00:00
Fix crash decoding huge .aseprite files
Now we don't allocate an huge temporal array of width x height x bytes per pixel to store uncompressed data per image. Reported by an user editing a 35000x35000 canvas. Similar to https://community.aseprite.org/t/vector-too-long-empty-file-and-lost-work/6844 Internal report: https://igarastudio.zendesk.com/agent/tickets/4703
This commit is contained in:
parent
1c75092e13
commit
067309f776
@ -27,6 +27,7 @@
|
|||||||
#include "zlib.h"
|
#include "zlib.h"
|
||||||
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace dio {
|
namespace dio {
|
||||||
|
|
||||||
@ -694,20 +695,21 @@ void read_compressed_image_templ(FileInterface* f,
|
|||||||
{
|
{
|
||||||
PixelIO<ImageTraits> pixel_io;
|
PixelIO<ImageTraits> pixel_io;
|
||||||
z_stream zstream;
|
z_stream zstream;
|
||||||
int y, err;
|
|
||||||
|
|
||||||
zstream.zalloc = (alloc_func)0;
|
zstream.zalloc = (alloc_func)0;
|
||||||
zstream.zfree = (free_func)0;
|
zstream.zfree = (free_func)0;
|
||||||
zstream.opaque = (voidpf)0;
|
zstream.opaque = (voidpf)0;
|
||||||
|
|
||||||
err = inflateInit(&zstream);
|
int err = inflateInit(&zstream);
|
||||||
if (err != Z_OK)
|
if (err != Z_OK)
|
||||||
throw base::Exception("ZLib error %d in inflateInit().", err);
|
throw base::Exception("ZLib error %d in inflateInit().", err);
|
||||||
|
|
||||||
std::vector<uint8_t> scanline(ImageTraits::getRowStrideBytes(image->width()));
|
const int width = image->width();
|
||||||
std::vector<uint8_t> uncompressed(image->height() * ImageTraits::getRowStrideBytes(image->width()));
|
const int rowstride = ImageTraits::getRowStrideBytes(width);
|
||||||
|
std::vector<uint8_t> scanline(rowstride);
|
||||||
std::vector<uint8_t> compressed(4096);
|
std::vector<uint8_t> compressed(4096);
|
||||||
int uncompressed_offset = 0;
|
std::vector<uint8_t> uncompressed(4096);
|
||||||
|
int scanline_offset = 0;
|
||||||
|
int y = 0;
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
size_t input_bytes;
|
size_t input_bytes;
|
||||||
@ -738,38 +740,48 @@ void read_compressed_image_templ(FileInterface* f,
|
|||||||
zstream.avail_in = bytes_read;
|
zstream.avail_in = bytes_read;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
zstream.next_out = (Bytef*)&scanline[0];
|
zstream.next_out = (Bytef*)&uncompressed[0];
|
||||||
zstream.avail_out = scanline.size();
|
zstream.avail_out = uncompressed.size();
|
||||||
|
|
||||||
err = inflate(&zstream, Z_NO_FLUSH);
|
err = inflate(&zstream, Z_NO_FLUSH);
|
||||||
if (err != Z_OK && err != Z_STREAM_END && err != Z_BUF_ERROR)
|
if (err != Z_OK && err != Z_STREAM_END && err != Z_BUF_ERROR)
|
||||||
throw base::Exception("ZLib error %d in inflate().", err);
|
throw base::Exception("ZLib error %d in inflate().", err);
|
||||||
|
|
||||||
size_t uncompressed_bytes = scanline.size() - zstream.avail_out;
|
size_t uncompressed_bytes = uncompressed.size() - zstream.avail_out;
|
||||||
if (uncompressed_bytes > 0) {
|
if (uncompressed_bytes > 0) {
|
||||||
if (uncompressed_offset+uncompressed_bytes > uncompressed.size())
|
int i = 0;
|
||||||
throw base::Exception("Bad compressed image.");
|
while (true) {
|
||||||
|
int n = std::min(uncompressed_bytes, scanline.size() - scanline_offset);
|
||||||
std::copy(scanline.begin(), scanline.begin()+uncompressed_bytes,
|
if (n > 0) {
|
||||||
uncompressed.begin()+uncompressed_offset);
|
// Fill the scanline buffer until it's completed
|
||||||
|
std::copy(uncompressed.begin()+i,
|
||||||
uncompressed_offset += uncompressed_bytes;
|
uncompressed.begin()+i+n,
|
||||||
|
scanline.begin()+scanline_offset);
|
||||||
|
uncompressed_bytes -= n;
|
||||||
|
scanline_offset += n;
|
||||||
|
i += n;
|
||||||
|
}
|
||||||
|
else if (scanline_offset < rowstride) {
|
||||||
|
// The scanline is not filled yet.
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Copy the whole scanline to the image
|
||||||
|
pixel_io.read_scanline(
|
||||||
|
(typename ImageTraits::address_t)image->getPixelAddress(0, y),
|
||||||
|
width, &scanline[0]);
|
||||||
|
++y;
|
||||||
|
scanline_offset = 0;
|
||||||
|
if (uncompressed_bytes == 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} while (zstream.avail_out == 0);
|
} while (zstream.avail_in != 0 && zstream.avail_out == 0);
|
||||||
|
|
||||||
delegate->progress((float)f->tell() / (float)header->size);
|
delegate->progress((float)f->tell() / (float)header->size);
|
||||||
}
|
}
|
||||||
|
|
||||||
uncompressed_offset = 0;
|
|
||||||
for (y=0; y<image->height(); y++) {
|
|
||||||
typename ImageTraits::address_t address =
|
|
||||||
(typename ImageTraits::address_t)image->getPixelAddress(0, y);
|
|
||||||
|
|
||||||
pixel_io.read_scanline(address, image->width(), &uncompressed[uncompressed_offset]);
|
|
||||||
|
|
||||||
uncompressed_offset += ImageTraits::getRowStrideBytes(image->width());
|
|
||||||
}
|
|
||||||
|
|
||||||
err = inflateEnd(&zstream);
|
err = inflateEnd(&zstream);
|
||||||
if (err != Z_OK)
|
if (err != Z_OK)
|
||||||
throw base::Exception("ZLib error %d in inflateEnd().", err);
|
throw base::Exception("ZLib error %d in inflateEnd().", err);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user