mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-01 18:00:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Too much data to uncompress" error recovering sessions (fix #4291)

Browse Source 
This is due zlib returning Z_OK (instead of Z_STREAM_END) after
inflate() when all the output buffer was filled (avail_out = 0) but it
reports like there is still available uncompressed data (avail_in > 0).
It makes no sense but an extra inflate() call with avail_out=0
consumes the whole avail_in and the expected Z_STREAM_END is finally
reported.
This commit is contained in:
David Capello 2024-02-02 14:01:07 -03:00
parent e0a677545e
commit 5900605549
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/doc/image_io.cpp
View File

@ -1,5 +1,5 @@
// Aseprite Document Library // Aseprite Document Library
// Copyright (c) 2019-2020 Igara Studio S.A. // Copyright (c) 2019-2024 Igara Studio S.A.
// Copyright (c) 2001-2018 David Capello // Copyright (c) 2001-2018 David Capello
// //
// This file is released under the terms of the MIT license. // This file is released under the terms of the MIT license.
@ -169,12 +169,24 @@ Image* read_image(std::istream& is, bool setId)
do { do {
if (address == address_end) { if (address == address_end) {
if (y == image->height()) if (y < image->height()) {
throw base::Exception("Too much data to uncompress for the image.");
address = image->getPixelAddress(0, y++); address = image->getPixelAddress(0, y++);
address_end = address + widthBytes; address_end = address + widthBytes;
} }
else {
// Special reported case where we just fill the whole
// output image buffer (avail_out == 0), and more input
// was previously reported as available (avail_in != 0).
//
// Not sure why zlib reports this in certain cases, where
// avail_in != 0 and err == Z_OK instead of err ==
// Z_STREAM_END and we have to do a final inflate() call
// (even w/avail_out=0) to get the final Z_STREAM_END
// result.
ASSERT(y == image->height());
ASSERT(err == Z_OK);
}
}
zstream.next_out = (Bytef*)address; zstream.next_out = (Bytef*)address;
zstream.avail_out = address_end - address; zstream.avail_out = address_end - address;