ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some memleaks in NANDContentLoader.cpp and ISOProperties.cpp 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3919 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-08-01 17:51:17 +00:00
parent dedb2a5fcc
commit 1493c2ba9c
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DiscIO/Src/DiscScrubber.cpp
View File

@ -127,7 +127,7 @@ bool Scrub(const char* filename, CompressCB callback, void* arg)
// Warn if not DVD5 or DVD9 size // Warn if not DVD5 or DVD9 size
if (numClusters != 0x23048 && numClusters != 0x46090) if (numClusters != 0x23048 && numClusters != 0x46090)
WARN_LOG(DISCIO, "%s is not a standard sized wii m_Disc! (%x blocks)", filename, numClusters); WARN_LOG(DISCIO, "%s is not a standard sized wii disc! (%x blocks)", filename, numClusters);
// Table of free blocks // Table of free blocks
m_FreeTable = new u8[numClusters]; m_FreeTable = new u8[numClusters];

1
Source/Core/DiscIO/Src/NANDContentLoader.cpp
View File

@ -72,6 +72,7 @@ CSharedContent::CSharedContent()
m_Elements.push_back(Element); m_Elements.push_back(Element);
} }
} }
fclose(pFile);
} }
} }

10
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -199,7 +199,15 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
CISOProperties::~CISOProperties() CISOProperties::~CISOProperties()
{ {
if (IsVolumeWiiDisc(OpenISO)) if (IsVolumeWiiDisc(OpenISO))
WiiDisc.clear(); {
for (std::vector<WiiPartition>::const_iterator PartIter = WiiDisc.begin(); PartIter != WiiDisc.end(); ++PartIter)
{
delete PartIter->FileSystem;
delete PartIter->Partition;
for (std::vector<const DiscIO::SFileInfo *>::const_iterator FileIter = PartIter->Files.begin(); FileIter != PartIter->Files.end(); ++FileIter)
delete *FileIter;
}
}
else else
if (!IsVolumeWadFile(OpenISO)) if (!IsVolumeWadFile(OpenISO))
delete pFileSystem; delete pFileSystem;