OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-27 01:20:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #400 from yuriks/filesys-leak

Browse Source 
FileSys: Fix a few memory leaks
This commit is contained in:
bunnei 2015-01-03 15:00:50 -05:00
commit a0cb320bad
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/file_sys/disk_archive.cpp
View File

@ -6,6 +6,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/make_unique.h"
#include "core/file_sys/disk_archive.h" #include "core/file_sys/disk_archive.h"
#include "core/settings.h" #include "core/settings.h"
@ -17,10 +18,10 @@ namespace FileSys {
std::unique_ptr<FileBackend> DiskArchive::OpenFile(const Path& path, const Mode mode) const { std::unique_ptr<FileBackend> DiskArchive::OpenFile(const Path& path, const Mode mode) const {
LOG_DEBUG(Service_FS, "called path=%s mode=%01X", path.DebugStr().c_str(), mode.hex); LOG_DEBUG(Service_FS, "called path=%s mode=%01X", path.DebugStr().c_str(), mode.hex);
DiskFile* file = new DiskFile(this, path, mode); auto file = Common::make_unique<DiskFile>(this, path, mode);
if (!file->Open()) if (!file->Open())
return nullptr; return nullptr;
return std::unique_ptr<FileBackend>(file); return std::move(file);
} }
bool DiskArchive::DeleteFile(const Path& path) const { bool DiskArchive::DeleteFile(const Path& path) const {
@ -66,10 +67,10 @@ bool DiskArchive::RenameDirectory(const Path& src_path, const Path& dest_path) c
std::unique_ptr<DirectoryBackend> DiskArchive::OpenDirectory(const Path& path) const { std::unique_ptr<DirectoryBackend> DiskArchive::OpenDirectory(const Path& path) const {
LOG_DEBUG(Service_FS, "called path=%s", path.DebugStr().c_str()); LOG_DEBUG(Service_FS, "called path=%s", path.DebugStr().c_str());
DiskDirectory* directory = new DiskDirectory(this, path); auto directory = Common::make_unique<DiskDirectory>(this, path);
if (!directory->Open()) if (!directory->Open())
return nullptr; return nullptr;
return std::unique_ptr<DirectoryBackend>(directory); return std::move(directory);
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -100,7 +101,7 @@ bool DiskFile::Open() {
// Open the file in binary mode, to avoid problems with CR/LF on Windows systems // Open the file in binary mode, to avoid problems with CR/LF on Windows systems
mode_string += "b"; mode_string += "b";
file = new FileUtil::IOFile(path, mode_string.c_str()); file = Common::make_unique<FileUtil::IOFile>(path, mode_string.c_str());
return true; return true;
} }

2
src/core/file_sys/disk_archive.h
View File

@ -75,7 +75,7 @@ protected:
const DiskArchive* archive; const DiskArchive* archive;
std::string path; std::string path;
Mode mode; Mode mode;
FileUtil::IOFile* file; std::unique_ptr<FileUtil::IOFile> file;
}; };
class DiskDirectory : public DirectoryBackend { class DiskDirectory : public DirectoryBackend {