all repos — mgba @ a8f003d81a98aa3c004895757004df61250bedc8

mGBA Game Boy Advance Emulator

Util: Fix crash if PNG header fails to write
Vicki Pfau vi@endrift.com
Sun, 28 Jun 2020 00:40:24 -0700
commit

a8f003d81a98aa3c004895757004df61250bedc8

parent

98e13900ac63499457ad51ddb529f42fe09915eb

2 files changed, 4 insertions(+), 6 deletions(-)

jump to
M CHANGESCHANGES

@@ -13,6 +13,7 @@ - GB Core: Fix extracting SRAM when none is present

- GBA Savedata: Fix extracting save when not yet configured in-game - Qt: Fix file handle leak on opening an invalid ROM - Qt: Fix Italian RTC translation (fixes mgba.io/i/1798) + - Util: Fix crash if PNG header fails to write Misc: - Qt: Add per-page scrolling to memory view (fixes mgba.io/i/1795) - Qt: Add setting to display ROM filename in title (closes mgba.io/i/1784)
M src/util/png-io.csrc/util/png-io.c

@@ -47,19 +47,16 @@ if (setjmp(png_jmpbuf(png))) {

return 0; } png_set_IHDR(png, info, width, height, 8, type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + png_write_info(png, info); return info; } png_infop PNGWriteHeader(png_structp png, unsigned width, unsigned height) { - png_infop info = _pngWriteHeader(png, width, height, PNG_COLOR_TYPE_RGB); - png_write_info(png, info); - return info; + return _pngWriteHeader(png, width, height, PNG_COLOR_TYPE_RGB); } png_infop PNGWriteHeaderA(png_structp png, unsigned width, unsigned height) { - png_infop info = _pngWriteHeader(png, width, height, PNG_COLOR_TYPE_RGB_ALPHA); - png_write_info(png, info); - return info; + return _pngWriteHeader(png, width, height, PNG_COLOR_TYPE_RGB_ALPHA); } png_infop PNGWriteHeader8(png_structp png, unsigned width, unsigned height) {