From 3d5d02fc15197eac5a663f5c79db21ff88cae5a4 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sun, 3 Mar 2019 19:58:01 -0500
Subject: [PATCH 1/3] Error if the lump is a PNG lump

---
 src/w_wad.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/w_wad.c b/src/w_wad.c
index 88e89974..9ca4e0ff 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1175,6 +1175,29 @@ void zerr(int ret)
 }
 #endif
 
+#define NO_PNG_LUMPS
+
+#ifdef NO_PNG_LUMPS
+static void ErrorIfPNG(void *d, size_t s, char *f, char *l)
+{
+    if (s < 67) // http://garethrees.org/2007/11/14/pngcrush/
+        return;
+#define sigcheck ((UINT8 *)d)
+    if (sigcheck[0] == 0x89
+        && sigcheck[1] == 0x50
+        && sigcheck[2] == 0x4e
+        && sigcheck[3] == 0x47
+        && sigcheck[4] == 0x0d
+        && sigcheck[5] == 0x0a
+        && sigcheck[6] == 0x1a
+        && sigcheck[7] == 0x0a)
+    {
+        I_Error("W_Wad: Lump \"%s\" in file \"%s\" is a .PNG - please convert to either Doom or Flat (raw) image format.", l, f);
+    }
+#undef sigcheck
+}
+#endif
+
 /** Reads bytes from the head of a lump.
   * Note: If the lump is compressed, the whole thing has to be read anyway.
   *
@@ -1214,7 +1237,15 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
 	switch(wadfiles[wad]->lumpinfo[lump].compression)
 	{
 	case CM_NOCOMPRESSION:		// If it's uncompressed, we directly write the data into our destination, and return the bytes read.
+#ifdef NO_PNG_LUMPS
+		{
+			size_t bytesread = fread(dest, 1, size, handle);
+			ErrorIfPNG(dest, bytesread, wadfiles[wad]->filename, l->name2);
+			return bytesread;
+		}
+#else
 		return fread(dest, 1, size, handle);
+#endif
 	case CM_LZF:		// Is it LZF compressed? Used by ZWADs.
 		{
 #ifdef ZWAD
@@ -1249,11 +1280,15 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
 			M_Memcpy(dest, decData + offset, size);
 			Z_Free(rawData);
 			Z_Free(decData);
+#ifdef NO_PNG_LUMPS
+			ErrorIfPNG(dest, size, wadfiles[wad]->filename, l->name2);
+#endif
 			return size;
 #else
 			//I_Error("ZWAD files not supported on this platform.");
 			return 0;
 #endif
+
 		}
 #ifdef HAVE_ZLIB
 	case CM_DEFLATE: // Is it compressed via DEFLATE? Very common in ZIPs/PK3s, also what most doom-related editors support.
@@ -1307,6 +1342,9 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
 			Z_Free(rawData);
 			Z_Free(decData);
 
+#ifdef NO_PNG_LUMPS
+			ErrorIfPNG(dest, size, wadfiles[wad]->filename, l->name2);
+#endif
 			return size;
 		}
 #endif

From 15323328c5659ebee4c5b740c52b1968167e0f56 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Sun, 3 Mar 2019 22:43:21 -0500
Subject: [PATCH 2/3] Check using memcmp()

---
 src/w_wad.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/w_wad.c b/src/w_wad.c
index 9ca4e0ff..b5aa95fa 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1183,14 +1183,10 @@ static void ErrorIfPNG(void *d, size_t s, char *f, char *l)
     if (s < 67) // http://garethrees.org/2007/11/14/pngcrush/
         return;
 #define sigcheck ((UINT8 *)d)
-    if (sigcheck[0] == 0x89
-        && sigcheck[1] == 0x50
-        && sigcheck[2] == 0x4e
-        && sigcheck[3] == 0x47
-        && sigcheck[4] == 0x0d
-        && sigcheck[5] == 0x0a
-        && sigcheck[6] == 0x1a
-        && sigcheck[7] == 0x0a)
+    // Check for PNG file signature using memcmp
+    // As it may be faster on CPUs with slow unaligned memory access
+    // Ref: http://www.libpng.org/pub/png/spec/1.2/PNG-Rationale.html#R.PNG-file-signature
+    if (memcmp(&sigcheck[0], "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a", 8) == 0)
     {
         I_Error("W_Wad: Lump \"%s\" in file \"%s\" is a .PNG - please convert to either Doom or Flat (raw) image format.", l, f);
     }

From 6d751ff30257ce2f24b8f1aadb848438786b2949 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Fri, 15 Mar 2019 18:46:25 -0400
Subject: [PATCH 3/3] Remove the define.

---
 src/w_wad.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/w_wad.c b/src/w_wad.c
index 4f014208..c4f9ceca 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1182,19 +1182,17 @@ void zerr(int ret)
 #define NO_PNG_LUMPS
 
 #ifdef NO_PNG_LUMPS
-static void ErrorIfPNG(void *d, size_t s, char *f, char *l)
+static void ErrorIfPNG(UINT8 *d, size_t s, char *f, char *l)
 {
     if (s < 67) // http://garethrees.org/2007/11/14/pngcrush/
         return;
-#define sigcheck ((UINT8 *)d)
     // Check for PNG file signature using memcmp
     // As it may be faster on CPUs with slow unaligned memory access
     // Ref: http://www.libpng.org/pub/png/spec/1.2/PNG-Rationale.html#R.PNG-file-signature
-    if (memcmp(&sigcheck[0], "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a", 8) == 0)
+    if (memcmp(&d[0], "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a", 8) == 0)
     {
         I_Error("W_Wad: Lump \"%s\" in file \"%s\" is a .PNG - please convert to either Doom or Flat (raw) image format.", l, f);
     }
-#undef sigcheck
 }
 #endif