all repos — mgba @ b68c393223ed73d81f4c9896c3d6e0e7262243e3

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

b68c393223ed73d81f4c9896c3d6e0e7262243e3

parent

f6522ea08468cea5c18784a948db145c8bb7f316

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

jump to
M CHANGESCHANGES

@@ -35,6 +35,7 @@ - Qt: Fix static compilation in MinGW (fixes mgba.io/i/1769)

- Qt: Fix file handle leak on opening an invalid ROM - Qt: Fix a race condition in the frame inspector - Qt: Fix Italian RTC translation (fixes mgba.io/i/1798) + - Util: Fix crash if PNG header fails to write Misc: - Debugger: Keep track of global cycle count - FFmpeg: Add looping option for GIF/APNG
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) {