ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Util: Fix crash if PNG header fails to write

This commit is contained in:
Vicki Pfau 2020-06-28 00:40:24 -07:00
parent 98e13900ac
commit a8f003d81a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -13,6 +13,7 @@ Other fixes:
- GBA Savedata: Fix extracting save when not yet configured in-game - GBA Savedata: Fix extracting save when not yet configured in-game
- Qt: Fix file handle leak on opening an invalid ROM - Qt: Fix file handle leak on opening an invalid ROM
- Qt: Fix Italian RTC translation (fixes mgba.io/i/1798) - Qt: Fix Italian RTC translation (fixes mgba.io/i/1798)
- Util: Fix crash if PNG header fails to write
Misc: Misc:
- Qt: Add per-page scrolling to memory view (fixes mgba.io/i/1795) - 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) - Qt: Add setting to display ROM filename in title (closes mgba.io/i/1784)

9
src/util/png-io.c
View File

@ -47,19 +47,16 @@ static png_infop _pngWriteHeader(png_structp png, unsigned width, unsigned heigh
return 0; return 0;
} }
png_set_IHDR(png, info, width, height, 8, type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); 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; return info;
} }
png_infop PNGWriteHeader(png_structp png, unsigned width, unsigned height) { png_infop PNGWriteHeader(png_structp png, unsigned width, unsigned height) {
png_infop info = _pngWriteHeader(png, width, height, PNG_COLOR_TYPE_RGB); return _pngWriteHeader(png, width, height, PNG_COLOR_TYPE_RGB);
png_write_info(png, info);
return info;
} }
png_infop PNGWriteHeaderA(png_structp png, unsigned width, unsigned height) { png_infop PNGWriteHeaderA(png_structp png, unsigned width, unsigned height) {
png_infop info = _pngWriteHeader(png, width, height, PNG_COLOR_TYPE_RGB_ALPHA); return _pngWriteHeader(png, width, height, PNG_COLOR_TYPE_RGB_ALPHA);
png_write_info(png, info);
return info;
} }
png_infop PNGWriteHeader8(png_structp png, unsigned width, unsigned height) { png_infop PNGWriteHeader8(png_structp png, unsigned width, unsigned height) {