thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SAGA: fix submit 53486 "Added sanity checks for realloc() calls - bug report #3087852". zero count realloc may return NULL as valid value

Browse source 
svn-id: r53614
This commit is contained in:
Andrew Kurushin 2010-10-19 15:31:07 +00:00
parent f8c7243938
commit 0e7abce271
4 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/saga/sprite.cpp
View file

@ -116,13 +116,10 @@ void Sprite::loadList(int resourceId, SpriteList &spriteList) {
newSpriteCount = spriteList.spriteCount + spriteCount;
SpriteInfo *tmp = (SpriteInfo *)realloc(spriteList.infoList, newSpriteCount * sizeof(*spriteList.infoList));
if (tmp)
if ((tmp != NULL) || (newSpriteCount == 0)) {
spriteList.infoList = tmp;
else
} else {
error("Sprite::loadList(): Error while reallocating memory");
if (spriteList.infoList == NULL) {
memoryError("Sprite::loadList");
}
spriteList.spriteCount = newSpriteCount;