From b897309eafef884daba585f276e54a541891697d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 25 Jan 2013 13:00:50 -0500 Subject: [PATCH 1/3] Fix some resource leaks/memory leaks. --- Common/ArmCPUDetect.cpp | 6 ++++++ Common/FileUtil.cpp | 12 ++++++++++++ Common/StringUtil.h | 18 +++++++++++------- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Common/ArmCPUDetect.cpp b/Common/ArmCPUDetect.cpp index 36c5e27411..1775df58f6 100644 --- a/Common/ArmCPUDetect.cpp +++ b/Common/ArmCPUDetect.cpp @@ -44,6 +44,8 @@ char *GetCPUString() // INFO_LOG(BOOT, "CPU: %s", cpu_string); break; } + + fclose(fp); return cpu_string; } bool CheckCPUFeature(const char *feature) @@ -69,6 +71,8 @@ bool CheckCPUFeature(const char *feature) token = strtok(NULL, " "); } } + + fclose(fp); return false; } #endif @@ -94,6 +98,8 @@ int GetCoreCount() continue; ++cores; } + + fclose(fp); return cores; #endif } diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp index 638f278b0f..d3a8b39a5e 100644 --- a/Common/FileUtil.cpp +++ b/Common/FileUtil.cpp @@ -567,12 +567,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/Common/StringUtil.h b/Common/StringUtil.h index b4282c3533..0b2ca1bd08 100644 --- a/Common/StringUtil.h +++ b/Common/StringUtil.h @@ -42,16 +42,20 @@ static inline int vasprintf(char **rResult, const char *aFormat, va_list aAp) rVal = vsnprintf(result, 16, aFormat, ap); va_end(ap); - if (rVal == -1) return rVal; + if (rVal == -1) + { + free(result); + return rVal; + } else if (rVal >= 16) { - free(result); - result = (char *) malloc(rVal + 1); - if (result == NULL) return -1; + free(result); + result = (char *) malloc(rVal + 1); + if (result == NULL) return -1; - va_copy(ap, aAp); - rVal = vsnprintf(result, rVal + 1, aFormat, aAp); - va_end(ap); + va_copy(ap, aAp); + rVal = vsnprintf(result, rVal + 1, aFormat, aAp); + va_end(ap); } *rResult = result; From c3d6f67c7c49993fa1e1e13fdcbb7269ce7d41f9 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 25 Jan 2013 13:07:01 -0500 Subject: [PATCH 2/3] Fix release() in StdMutex.h Originally fixed here: https://code.google.com/p/dolphin-emu/source/detail?spec=svn74a5ad542b44a18751acc19e4d1229d640cc4c0f&r=4f4aa4860df98f401384f6e598cb649b13882e79 --- Common/StdMutex.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Common/StdMutex.h b/Common/StdMutex.h index b71d0dccbe..27aa7f5c5d 100644 --- a/Common/StdMutex.h +++ b/Common/StdMutex.h @@ -318,9 +318,12 @@ public: mutex_type* release() { - return mutex(); + mutex_type* const ret = mutex(); + pm = NULL; owns = false; + + return ret; } bool owns_lock() const From 1cc74aa6c01f4cb34ce41d21a02cf8f028d1d00c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 25 Jan 2013 13:11:06 -0500 Subject: [PATCH 3/3] Get rid of unused iterators. --- Core/MIPS/ARM/ArmJitCache.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Core/MIPS/ARM/ArmJitCache.cpp b/Core/MIPS/ARM/ArmJitCache.cpp index c457e0c9c3..6956625a17 100644 --- a/Core/MIPS/ARM/ArmJitCache.cpp +++ b/Core/MIPS/ARM/ArmJitCache.cpp @@ -299,29 +299,27 @@ void ArmJitBlockCache::LinkBlock(int i) { LinkBlockExits(i); ArmJitBlock &b = blocks[i]; - std::map::iterator iter; pair::iterator, multimap::iterator> ppp; // equal_range(b) returns pair representing the range // of element with key b ppp = links_to.equal_range(b.originalAddress); if (ppp.first == ppp.second) return; - for (multimap::iterator iter2 = ppp.first; iter2 != ppp.second; ++iter2) { + for (multimap::iterator iter = ppp.first; iter != ppp.second; ++iter) { // PanicAlert("Linking block %i to block %i", iter2->second, i); - LinkBlockExits(iter2->second); + LinkBlockExits(iter->second); } } void ArmJitBlockCache::UnlinkBlock(int i) { ArmJitBlock &b = blocks[i]; - std::map::iterator iter; pair::iterator, multimap::iterator> ppp; ppp = links_to.equal_range(b.originalAddress); if (ppp.first == ppp.second) return; - for (multimap::iterator iter2 = ppp.first; iter2 != ppp.second; ++iter2) { - ArmJitBlock &sourceBlock = blocks[iter2->second]; + for (multimap::iterator iter = ppp.first; iter != ppp.second; ++iter) { + ArmJitBlock &sourceBlock = blocks[iter->second]; for (int e = 0; e < 2; e++) { if (sourceBlock.exitAddress[e] == b.originalAddress) @@ -368,7 +366,7 @@ void ArmJitBlockCache::InvalidateICache(u32 address, const u32 length) // destroy JIT blocks // !! this works correctly under assumption that any two overlapping blocks end at the same address - std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1, it; + std::map, u32>::iterator it1 = block_map.lower_bound(std::make_pair(pAddr, 0)), it2 = it1; while (it2 != block_map.end() && it2->first.second < pAddr + length) { DestroyBlock(it2->second, true);