libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 12:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Close Memory Leaks in SCI Resource Loading, reported by Valgrind.

Browse Source 
svn-id: r54916
This commit is contained in:
David Turner 2010-12-14 23:30:22 +00:00
parent e88fcee057
commit f2205a5a01
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/sci/resource.cpp
View File

@ -195,6 +195,7 @@ Resource::Resource(ResourceManager *resMan, ResourceId id) : _resMan(resMan), _i
Resource::~Resource() {
delete[] data;
delete[] _header;
if (_source && _source->getSourceType() == kSourcePatch)
delete _source;
}
@ -1091,9 +1092,11 @@ ResVersion ResourceManager::detectMapVersion() {
fileStream = file;
}
break;
} else if (rsrc->getSourceType() == kSourceMacResourceFork)
} else if (rsrc->getSourceType() == kSourceMacResourceFork) {
delete fileStream;
return kResVersionSci11Mac;
}
}
if (!fileStream)
error("Failed to open resource map file");
@ -1106,9 +1109,12 @@ ResVersion ResourceManager::detectMapVersion() {
// check if 0 or 01 - try to read resources in SCI0 format and see if exists
fileStream->seek(0, SEEK_SET);
while (fileStream->read(buff, 6) == 6 && !(buff[0] == 0xFF && buff[1] == 0xFF && buff[2] == 0xFF)) {
if (findVolume(rsrc, (buff[5] & 0xFC) >> 2) == NULL)
if (findVolume(rsrc, (buff[5] & 0xFC) >> 2) == NULL) {
delete fileStream;
return kResVersionSci1Middle;
}
}
delete fileStream;
return kResVersionSci0Sci1Early;
}