Merge pull request OpenRA#8611 from Mailaender/pngloader-nre-2

Fixed another null reference exception in PngLoader
MushroomWobbit · Jul 1, 2015 · faaa484 · faaa484
2 parents 2a998e4 + 605f952
commit faaa484
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/OpenRA.Game/FileFormats/PngLoader.cs b/OpenRA.Game/FileFormats/PngLoader.cs
@@ -84,6 +84,9 @@ public static Bitmap Load(Stream s)
 
 							case "tRNS":
 								{
+									if (palette == null)
+										throw new InvalidDataException("Non-Palette indexed PNG are not supported.");
+
 									for (var i = 0; i < length; i++)
 										palette[i] = Color.FromArgb(cr.ReadByte(), palette[i]);
 								}