Don't crash on empty images.

In ROOFTOPS.DAT for example.
NagyD · Sep 17, 2017 · 010c4b0 · 010c4b0
1 parent d24cc30
commit 010c4b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/lib/object/image/image16.c b/src/lib/object/image/image16.c
@@ -158,7 +158,9 @@ int mExpandGraphic(const unsigned char* data,tImage *image, int dataSizeInBytes)
 
 	int imageSizeInBytes=0;
 	int result;
-
+
+	if (dataSizeInBytes < 6) return COMPRESS_RESULT_FATAL; // Empty images are only 2 bytes: 00 00.
+
 	image->height=array2short(data);
 	data+=2;
 	image->width =array2short(data);

diff --git a/src/lib/object/image/image256.c b/src/lib/object/image/image256.c
@@ -120,6 +120,8 @@ int mExpandGraphic256(const unsigned char* data,tImage *image, int dataSizeInByt
 
 	int imageSizeInBytes=0;
 
+	if (dataSizeInBytes < 6) return COMPRESS_RESULT_FATAL; // Empty images are only 2 bytes: 00 00.
+
 	image->height=array2short(data);
 	data+=2;
 	image->width =array2short(data);