stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-06-04 10:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash when tga image loader succeeds in loading a 0x0 image

Browse source 
Copy resource bitmaps before using them on a worker thread
This commit is contained in:
Magnus Norddahl 2020-03-19 15:46:04 +01:00
parent e19b2912f3
commit 44d972c876
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/IO/FileImageReader.cs
View file

@ -64,6 +64,9 @@ namespace CodeImp.DoomBuilder.IO
int width = rightMargin - leftMargin + 1;
int height = bottomMargin - topMargin + 1;
if (width == 0 || height == 0)
throw new InvalidDataException("Invalid pcx image file");
int vgaPaletteID = 0;
byte[] vgaPalette = null;
@ -250,6 +253,12 @@ namespace CodeImp.DoomBuilder.IO
if (colormap_type > 1)
throw new InvalidDataException("Invalid or unsupported targa image file");
if (image_type != 1 && image_type != 2 && image_type != 3 && image_type != 9 && image_type != 10 && image_type != 11)
throw new InvalidDataException("Invalid or unsupported targa image type");
if (image_width == 0 || image_height == 0)
throw new InvalidDataException("Invalid targa image file");
if (colormap_type == 0)
colormap_length = 0;