zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added a check to the ANIMATED parser that prints an error message if it tries to read past the end of the lump.

Browse source 
SVN r3679 (trunk)
This commit is contained in:
Christoph Oelckers 2012-06-06 07:02:30 +00:00
parent df7c03b933
commit 6db4164794
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/textures/animations.cpp
View file

@ -164,13 +164,15 @@ CVAR(Bool, debuganimated, false, 0)
void FTextureManager::InitAnimated (void) void FTextureManager::InitAnimated (void)
{ {
const BITFIELD texflags = TEXMAN_Overridable; const BITFIELD texflags = TEXMAN_Overridable;
// I think better not! This is only for old ANIMATED definition that // I think better not! This is only for old ANIMATED definitions that
// don't know about ZDoom's more flexible texture system. // don't know about ZDoom's more flexible texture system.
// | FTextureManager::TEXMAN_TryAny; // | FTextureManager::TEXMAN_TryAny;
if (Wads.CheckNumForName ("ANIMATED") != -1) int lumpnum = Wads.CheckNumForName ("ANIMATED");
if (lumpnum != -1)
{ {
FMemLump animatedlump = Wads.ReadLump ("ANIMATED"); FMemLump animatedlump = Wads.ReadLump (lumpnum);
int animatedlen = Wads.LumpLength(lumpnum);
const char *animdefs = (const char *)animatedlump.GetMem(); const char *animdefs = (const char *)animatedlump.GetMem();
const char *anim_p; const char *anim_p;
FTextureID pic1, pic2; FTextureID pic1, pic2;
@ -182,6 +184,11 @@ void FTextureManager::InitAnimated (void)
for (anim_p = animdefs; *anim_p != -1; anim_p += 23) for (anim_p = animdefs; *anim_p != -1; anim_p += 23)
{ {
// make sure the current chunk of data is inside the lump boundaries.
if (anim_p + 22 >= animdefs + animatedlen)
{
I_Error("Tried to read past end of ANIMATED lump.");
}
if (*anim_p /* .istexture */ & 1) if (*anim_p /* .istexture */ & 1)
{ {
// different episode ? // different episode ?