diff options
| author | Colin Snover | 2017-11-14 12:52:22 -0600 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-11-18 22:35:12 +0100 |
| commit | 5c89c39325f271a5ef4dcb55fbc013b3858791d5 (patch) | |
| tree | 9b8257d1bf8b6475c4ca38e868743b3a83d91741 /engines/fullpipe | |
| parent | ff96db23dfd9e2075a710786fa0b1a01c6759a02 (diff) | |
| download | scummvm-rg350-5c89c39325f271a5ef4dcb55fbc013b3858791d5.tar.gz scummvm-rg350-5c89c39325f271a5ef4dcb55fbc013b3858791d5.tar.bz2 scummvm-rg350-5c89c39325f271a5ef4dcb55fbc013b3858791d5.zip | |
FULLPIPE: Fix memory leak of save game thumbnail
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/detection.cpp | 13 | ||||
| -rw-r--r-- | engines/fullpipe/gameloader.h | 3 | ||||
| -rw-r--r-- | engines/fullpipe/stateloader.cpp | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp index e22bcd3d50..82c7954ced 100644 --- a/engines/fullpipe/detection.cpp +++ b/engines/fullpipe/detection.cpp @@ -180,13 +180,11 @@ SaveStateList FullpipeMetaEngine::listSaves(const char *target) const { int slotNum = atoi(file->c_str() + file->size() - 2); if (slotNum >= 0 && slotNum <= getMaximumSaveSlot()) { - Common::InSaveFile *in = saveFileMan->openForLoading(*file); + Common::ScopedPtr<Common::InSaveFile> in(saveFileMan->openForLoading(*file)); if (in) { Fullpipe::FullpipeSavegameHeader header; - Fullpipe::readSavegameHeader(in, header); + Fullpipe::readSavegameHeader(in.get(), header); saveList.push_back(SaveStateDescriptor(slotNum, header.saveName)); - delete header.thumbnail; - delete in; } } } @@ -201,13 +199,12 @@ void FullpipeMetaEngine::removeSaveState(const char *target, int slot) const { } SaveStateDescriptor FullpipeMetaEngine::querySaveMetaInfos(const char *target, int slot) const { - Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading( - Fullpipe::getSavegameFile(slot)); + Common::ScopedPtr<Common::InSaveFile> f(g_system->getSavefileManager()->openForLoading( + Fullpipe::getSavegameFile(slot))); if (f) { Fullpipe::FullpipeSavegameHeader header; - Fullpipe::readSavegameHeader(f, header); - delete f; + Fullpipe::readSavegameHeader(f.get(), header); // Create the return descriptor SaveStateDescriptor desc(slot, header.saveName); diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h index 5e4d931409..39ccb7784c 100644 --- a/engines/fullpipe/gameloader.h +++ b/engines/fullpipe/gameloader.h @@ -23,6 +23,7 @@ #ifndef FULLPIPE_GAMELOADER_H #define FULLPIPE_GAMELOADER_H +#include "common/ptr.h" #include "engines/savestate.h" #include "fullpipe/objects.h" @@ -83,7 +84,7 @@ struct FullpipeSavegameHeader { uint32 date; uint16 time; uint32 playtime; - Graphics::Surface *thumbnail; + Common::SharedPtr<Graphics::Surface> thumbnail; }; struct SaveHeader { diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp index 5a2ad51280..34c2252c79 100644 --- a/engines/fullpipe/stateloader.cpp +++ b/engines/fullpipe/stateloader.cpp @@ -195,8 +195,6 @@ void fillDummyHeader(Fullpipe::FullpipeSavegameHeader &header) { } bool readSavegameHeader(Common::InSaveFile *in, FullpipeSavegameHeader &header) { - header.thumbnail = NULL; - uint oldPos = in->pos(); in->seek(-4, SEEK_END); @@ -239,7 +237,7 @@ bool readSavegameHeader(Common::InSaveFile *in, FullpipeSavegameHeader &header) header.saveName = Common::String::format("%s %s", desc.getSaveDate().c_str(), desc.getSaveTime().c_str()); // Get the thumbnail - header.thumbnail = Graphics::loadThumbnail(*in); + header.thumbnail = Common::SharedPtr<Graphics::Surface>(Graphics::loadThumbnail(*in), Graphics::SurfaceDeleter()); in->seek(oldPos, SEEK_SET); // Rewind the file |