From 8759d82b8aa72c068a8377fc5bb53da8e8342dd4 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 16 Aug 2015 05:53:44 -0400
Subject: [PATCH] Merge pull request #2858 from lioncash/leak

DolphinWX: Fix memory leaks occurring in ISOProperties
---
 Source/Core/DolphinWX/ISOProperties.cpp | 20 +++++++++++++-------
 Source/Core/DolphinWX/ISOProperties.h   | 11 +++++++++--
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp
index 5ee8a4a52e..e94fae45ae 100644
--- a/Source/Core/DolphinWX/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/ISOProperties.cpp
@@ -206,17 +206,23 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 			{
 				for (u32 i = 0; i < 0xFFFFFFFF; i++) // yes, technically there can be OVER NINE THOUSAND partitions...
 				{
-					WiiPartition partition;
-					if ((partition.Partition = DiscIO::CreateVolumeFromFilename(fileName, group, i)) != nullptr)
+					std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(fileName, group, i));
+					if (volume != nullptr)
 					{
-						if ((partition.FileSystem = DiscIO::CreateFileSystem(partition.Partition)) != nullptr)
+						std::unique_ptr<DiscIO::IFileSystem> file_system(DiscIO::CreateFileSystem(volume.get()));
+						if (file_system != nullptr)
 						{
+							WiiPartition* const partition = new WiiPartition(std::move(volume), std::move(file_system));
+
 							wxTreeItemId PartitionRoot =
 								m_Treectrl->AppendItem(RootId, wxString::Format(_("Partition %i"), partition_count), 0, 0);
-							m_Treectrl->SetItemData(PartitionRoot, new WiiPartition(partition));
-							CreateDirectoryTree(PartitionRoot, partition.FileSystem->GetFileList());
+
+							m_Treectrl->SetItemData(PartitionRoot, partition);
+							CreateDirectoryTree(PartitionRoot, partition->FileSystem->GetFileList());
+
 							if (partition_count == 1)
 								m_Treectrl->Expand(PartitionRoot);
+
 							partition_count++;
 						}
 					}
@@ -767,7 +773,7 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
 
 void CISOProperties::ExportDir(const std::string& _rFullPath, const std::string& _rExportFolder, const WiiPartition* partition)
 {
-	DiscIO::IFileSystem* const fs = OpenISO->GetVolumeType() == DiscIO::IVolume::WII_DISC ? partition->FileSystem : pFileSystem;
+	DiscIO::IFileSystem* const fs = OpenISO->GetVolumeType() == DiscIO::IVolume::WII_DISC ? partition->FileSystem.get() : pFileSystem;
 
 	const std::vector<DiscIO::SFileInfo>& fst = fs->GetFileList();
 
@@ -920,7 +926,7 @@ void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
 	if (OpenISO->GetVolumeType() == DiscIO::IVolume::WII_DISC)
 	{
 		WiiPartition* partition = reinterpret_cast<WiiPartition*>(m_Treectrl->GetItemData(m_Treectrl->GetSelection()));
-		FS = partition->FileSystem;
+		FS = partition->FileSystem.get();
 	}
 	else
 	{
diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h
index 2f07ec8c10..b0a9983e9a 100644
--- a/Source/Core/DolphinWX/ISOProperties.h
+++ b/Source/Core/DolphinWX/ISOProperties.h
@@ -5,8 +5,10 @@
 #pragma once
 
 #include <cstddef>
+#include <memory>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 #include <wx/dialog.h>
 #include <wx/treebase.h>
@@ -36,8 +38,13 @@ namespace Gecko { class CodeConfigPanel; }
 class WiiPartition final : public wxTreeItemData
 {
 public:
-	DiscIO::IVolume *Partition;
-	DiscIO::IFileSystem *FileSystem;
+	WiiPartition(std::unique_ptr<DiscIO::IVolume> partition, std::unique_ptr<DiscIO::IFileSystem> file_system)
+		: Partition(std::move(partition)), FileSystem(std::move(file_system))
+	{
+	}
+
+	std::unique_ptr<DiscIO::IVolume> Partition;
+	std::unique_ptr<DiscIO::IFileSystem> FileSystem;
 };
 
 struct PHackData