flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2769 from cuberite/FastNBTAsserts

Browse Source 
Check for invalid tags when reading a compound tag
This commit is contained in:
Alexander Harkness 2015-12-18 14:40:23 +00:00
commit 05e39b249b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/WorldStorage/FastNBT.cpp
View File

@ -110,7 +110,12 @@ bool cParsedNBT::ReadCompound(void)
for (;;) for (;;)
{ {
NEEDBYTES(1); 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++; m_Pos++;
if (TagType == TAG_End) if (TagType == TAG_End)
{ {
@ -258,7 +263,6 @@ bool cParsedNBT::ReadTag(void)
#endif #endif
case TAG_Min: case TAG_Min:
{ {
ASSERT(!"Unhandled NBT tag type");
return false; return false;
} }
} // switch (iType) } // switch (iType)