libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 00:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGI: Fix crash on exit thanks to valgrind

Browse Source 
svn-id: r51311
This commit is contained in:
Eugene Sandulenko 2010-07-26 14:21:59 +00:00
parent aea09cb3a0
commit e4bc0c3a18
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/agi/agi.cpp
View File

@ -343,7 +343,7 @@ int AgiEngine::agiInit() {
// clear view table
for (i = 0; i < MAX_VIEWTABLE; i++)
memset(&_game.viewTable[i], 0, sizeof(VtEntry));
memset(&_game.viewTable[i], 0, sizeof(struct VtEntry));
initWords();

3
engines/agi/sprite.cpp
View File

@ -245,7 +245,7 @@ void SpritesMgr::objsRestoreArea(Sprite *s) {
// WORKAROUND (see ScummVM bug #1945716)
// When set.view command is called, current code cannot detect this situation while updating
// Thus we force removal of the old sprite
if (s->v->viewReplaced) {
if (s->v && s->v->viewReplaced) {
commitBlock(xPos, yPos, xPos + xSize, yPos + ySize);
s->v->viewReplaced = false;
}
@ -679,6 +679,7 @@ void SpritesMgr::showObj(int n) {
s.xSize = c->width;
s.ySize = c->height;
s.buffer = (uint8 *)malloc(s.xSize * s.ySize);
s.v = 0;
objsSaveArea(&s);
blitCel(x1, y1, 15, c, _vm->_game.views[n].agi256_2);

3
engines/agi/view.cpp
View File

@ -157,8 +157,7 @@ int AgiEngine::decodeView(int n) {
return errNoLoopsInView;
// allocate memory for all views
_game.views[n].loop = (ViewLoop *)
calloc(_game.views[n].numLoops, sizeof(ViewLoop));
_game.views[n].loop = (ViewLoop *)calloc(_game.views[n].numLoops, sizeof(ViewLoop));
if (_game.views[n].loop == NULL)
return errNotEnoughMemory;