From 456253c651a7230e1d8217969344894d876ad05a Mon Sep 17 00:00:00 2001
From: tycho <work.tycho@gmail.com>
Date: Thu, 17 Dec 2015 22:34:19 +0000
Subject: Check for invalid tags when reading a compound tag

---
 src/WorldStorage/FastNBT.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/WorldStorage/FastNBT.cpp b/src/WorldStorage/FastNBT.cpp
index 70570f7d0..a90db2b71 100644
--- a/src/WorldStorage/FastNBT.cpp
+++ b/src/WorldStorage/FastNBT.cpp
@@ -110,7 +110,12 @@ bool cParsedNBT::ReadCompound(void)
 	for (;;)
 	{
 		NEEDBYTES(1);
-		eTagType TagType = static_cast<eTagType>(m_Data[m_Pos]);
+		const char TagTypeNum = m_Data[m_Pos];
+		if ((TagTypeNum < TAG_Min) || (TagTypeNum > TAG_Max))
+		{
+			return false;
+		}
+		eTagType TagType = static_cast<eTagType>(TagTypeNum);
 		m_Pos++;
 		if (TagType == TAG_End)
 		{
@@ -258,7 +263,6 @@ bool cParsedNBT::ReadTag(void)
 		#endif
 		case TAG_Min:
 		{
-			ASSERT(!"Unhandled NBT tag type");
 			return false;
 		}
 	}  // switch (iType)
-- 
cgit v1.2.3