Max/mgba-ps3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Improve PNG deserialization logging

Browse Source
This commit is contained in:
Vicki Pfau 2024-12-31 01:35:49 -08:00
parent 4007e19736
commit 6b5638efda
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/serialize.c
View File

@ -249,9 +249,16 @@ static int _loadPNGChunkHandler(png_structp png, png_unknown_chunkp chunk) {
} }
const uint8_t* data = chunk->data; const uint8_t* data = chunk->data;
data += sizeof(uint32_t) * 2; data += sizeof(uint32_t) * 2;
uncompress((Bytef*) item.data, &len, data, chunk->size); if (uncompress((Bytef*) item.data, &len, data, chunk->size) == Z_OK) {
item.size = len; if (item.size != len) {
mStateExtdataPut(extdata, tag, &item); mLOG(SAVESTATE, WARN, "Mismatched decompressed extdata %i size (%"PRIz"u vs %"PRIz"u)", tag, item.size, (size_t) len);
item.size = len;
}
mStateExtdataPut(extdata, tag, &item);
} else {
mLOG(SAVESTATE, WARN, "Failed to decompress extdata chunk");
free(item.data);
}
return 1; return 1;
} }
return 0; return 0;
@ -320,7 +327,7 @@ static void* _loadPNGState(struct mCore* core, struct VFile* vf, struct mStateEx
return state; return state;
} }
static bool _loadPNGExtadata(struct VFile* vf, struct mStateExtdata* extdata) { static bool _loadPNGExtdata(struct VFile* vf, struct mStateExtdata* extdata) {
png_structp png = PNGReadOpen(vf, PNG_HEADER_BYTES); png_structp png = PNGReadOpen(vf, PNG_HEADER_BYTES);
png_infop info = png_create_info_struct(png); png_infop info = png_create_info_struct(png);
png_infop end = png_create_info_struct(png); png_infop end = png_create_info_struct(png);
@ -511,7 +518,7 @@ void* mCoreExtractState(struct mCore* core, struct VFile* vf, struct mStateExtda
bool mCoreExtractExtdata(struct mCore* core, struct VFile* vf, struct mStateExtdata* extdata) { bool mCoreExtractExtdata(struct mCore* core, struct VFile* vf, struct mStateExtdata* extdata) {
#ifdef USE_PNG #ifdef USE_PNG
if (isPNG(vf)) { if (isPNG(vf)) {
return _loadPNGExtadata(vf, extdata); return _loadPNGExtdata(vf, extdata);
} }
#endif #endif
if (!core) { if (!core) {