Fix a potential memory leak on non-windows systems.

Also added a FIXME to BPStructs.cpp and BPMemLoader.cpp
dolphin-emu · Jan 24, 2013 · 2db0c42 · 2db0c42
1 parent f69b6b5
commit 2db0c42
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
@@ -512,12 +512,24 @@ bool DeleteDirRecursively(const std::string &directory)
 		if (IsDirectory(newPath))
 		{
 			if (!DeleteDirRecursively(newPath))
+			{
+				#ifndef _WIN32
+				closedir(dirp);
+				#endif
+
 				return false;
+			}
 		}
 		else
 		{
 			if (!File::Delete(newPath))
+			{
+				#ifndef _WIN32
+				closedir(dirp);
+				#endif
+
 				return false;
+			}
 		}
 
 #ifdef _WIN32

diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp
@@ -519,6 +519,7 @@ void BPWritten(const BPCmd& bp)
 
 				for (u32 i = 0; i < tmem_cfg.preload_tile_info.count; ++i)
 				{
+					// FIXME: Duplicate conditions.
 					if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE ||
 						tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE)
 						break;

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
@@ -137,6 +137,7 @@ void SWBPWritten(int address, int newvalue)
 
 				for (int i = 0; i < tmem_cfg.preload_tile_info.count; ++i)
 				{
+					// FIXME: Duplicate conditions
 					if (tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE ||
 						tmem_addr_even + TMEM_LINE_SIZE > TMEM_SIZE)
 						break;