From 763fb2719f8c23907b9dc306f05b43dcb288d146 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 27 Apr 2014 20:48:59 -0700 Subject: [PATCH] Don't try to delete [] things that weren't new'd. --- .../SysCalls/Modules/cellSysutil_SaveData.cpp | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp index 695bf751dc..f3761601c3 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp @@ -366,12 +366,6 @@ int cellSaveDataListSave2(u32 version, mem_ptr_t setList, m // Enter the loop where the save files are read/created/deleted. s32 ret = modifySaveDataFiles(funcFile, result.GetAddr(), saveBaseDir + (char*)statGet->dir.dirName); - // TODO: There are other returns in this function that doesn't free the memory. Fix it (without using goto's, please). - for (auto& entry : saveEntries) { - delete[] entry.iconBuf; - entry.iconBuf = nullptr; - } - return ret; } @@ -457,12 +451,6 @@ int cellSaveDataListLoad2(u32 version, mem_ptr_t setList, m // Enter the loop where the save files are read/created/deleted. s32 ret = modifySaveDataFiles(funcFile, result.GetAddr(), saveBaseDir + (char*)statGet->dir.dirName); - // TODO: There are other returns in this function that doesn't free the memory. Fix it (without using goto's, please). - for (auto& entry : saveEntries) { - delete[] entry.iconBuf; - entry.iconBuf = nullptr; - } - return ret; } @@ -535,12 +523,6 @@ int cellSaveDataFixedSave2(u32 version, mem_ptr_t setList, // Enter the loop where the save files are read/created/deleted. s32 ret = modifySaveDataFiles(funcFile, result.GetAddr(), saveBaseDir + (char*)statGet->dir.dirName); - // TODO: There are other returns in this function that doesn't free the memory. Fix it (without using goto's, please). - for (auto& entry : saveEntries) { - delete[] entry.iconBuf; - entry.iconBuf = nullptr; - } - return ret; } @@ -613,12 +595,6 @@ int cellSaveDataFixedLoad2(u32 version, mem_ptr_t setList, // Enter the loop where the save files are read/created/deleted. s32 ret = modifySaveDataFiles(funcFile, result.GetAddr(), saveBaseDir + (char*)statGet->dir.dirName); - // TODO: There are other returns in this function that doesn't free the memory. Fix it (without using goto's, please). - for (auto& entry : saveEntries) { - delete[] entry.iconBuf; - entry.iconBuf = nullptr; - } - return ret; }