SCI: Fix leaks in ResourceManager::listResources caller code.

svn-id: r51666
This commit is contained in:
Johannes Schickel 2010-08-02 22:27:26 +00:00
parent a1001731fa
commit dd38e424e7
5 changed files with 8 additions and 2 deletions

View file

@ -844,6 +844,7 @@ bool Console::cmdVerifyScripts(int argc, const char **argv) {
}
DebugPrintf("SCI1.1-SCI2.1 script check finished\n");
delete resources;
return true;
}
@ -1006,6 +1007,7 @@ bool Console::cmdShowInstruments(int argc, const char **argv) {
DebugPrintf("\n\n");
}
delete resources;
return true;
}
@ -1051,7 +1053,6 @@ bool Console::cmdList(int argc, const char **argv) {
++itr;
}
DebugPrintf("\n");
delete resources;
}

View file

@ -299,7 +299,7 @@ Common::String convertSierraGameId(Common::String sierraId, uint32 *gameFlags, R
if (sierraId == "fp" || sierraId == "gk" || sierraId == "pq4")
demoThreshold = 150;
Common::List<ResourceId> *resources = resMan->listResources(kResourceTypeScript, -1);
Common::ScopedPtr<Common::List<ResourceId> > resources(resMan->listResources(kResourceTypeScript, -1));
if (resources->size() < demoThreshold) {
*gameFlags |= ADGF_DEMO;

View file

@ -438,6 +438,8 @@ SciVersion GameFeatures::detectMessageFunctionType() {
Common::List<ResourceId> *resources = g_sci->getResMan()->listResources(kResourceTypeMessage, -1);
if (resources->empty()) {
delete resources;
// No messages found, so this doesn't really matter anyway...
_messageFunctionType = SCI_VERSION_1_1;
return _messageFunctionType;
@ -445,6 +447,7 @@ SciVersion GameFeatures::detectMessageFunctionType() {
Resource *res = g_sci->getResMan()->findResource(*resources->begin(), false);
assert(res);
delete resources;
// Only v2 Message resources use the kGetMessage kernel function.
// v3-v5 use the kMessage kernel function.

View file

@ -95,6 +95,7 @@ reg_t kLock(EngineState *s, int argc, reg_t *argv) {
++itr;
}
delete resources;
} else {
which = g_sci->getResMan()->findResource(id, 0);

View file

@ -665,6 +665,7 @@ int ResourceManager::addInternalSources() {
++itr;
}
delete resources;
return 1;
}