The-Homebrew-Cloud/PayloadLoaderPayload
2
0
Fork 0
mirror of https://github.com/wiiu-env/PayloadLoaderPayload.git synced 2024-06-18 01:18:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

"fix" a memory leak.

Browse Source
This commit is contained in:
Maschell 2020-12-15 23:59:46 +01:00
parent 61f5ff067c
commit 9d0e08781d
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.cpp
View File

@ -14,10 +14,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/ ****************************************************************************/
#include <malloc.h>
#include <cstdint> #include <cstdint>
#include <coreinit/dynload.h> #include <coreinit/dynload.h>
#include <coreinit/screen.h> #include <coreinit/screen.h>
#include <coreinit/memexpheap.h>
#include "utils/ElfUtils.h" #include "utils/ElfUtils.h"
#include "utils/logger.h" #include "utils/logger.h"
@ -41,11 +43,14 @@ std::string PayloadSelectionScreen(const std::map<std::string, std::string> &pay
extern "C" void __init_wut(); extern "C" void __init_wut();
extern "C" void __fini_wut(); extern "C" void __fini_wut();
uint32_t memory_start = 0;
extern "C" uint32_t start_wrapper(int argc, char **argv) { extern "C" uint32_t start_wrapper(int argc, char **argv) {
doKernelSetup(); doKernelSetup();
InitFunctionPointers(); InitFunctionPointers();
memory_start = (uint32_t) malloc(1024);
__init_wut(); __init_wut();
WHBLogUdpInit(); WHBLogUdpInit();
@ -79,13 +84,27 @@ extern "C" uint32_t start_wrapper(int argc, char **argv) {
WHBLogUdpDeinit(); WHBLogUdpDeinit();
__fini_wut(); __fini_wut();
revertKernelHook(); revertKernelHook();
return entryPoint; return entryPoint;
} }
extern "C" int _start(int argc, char **argv) { extern "C" int _start(int argc, char **argv) {
uint32_t entryPoint = start_wrapper(argc, argv); uint32_t entryPoint = start_wrapper(argc, argv);
// Somewhere in this loader is a memory leak.
// This is a hacky solution to free that memory.
uint32_t head_end = (uint32_t) malloc(1024);
MEMExpHeapBlock *curUsedBlock = (MEMExpHeapBlock *) (head_end - 0x14);
while (curUsedBlock != 0) {
curUsedBlock = curUsedBlock->prev;
free(&curUsedBlock[1]);
if(((uint32_t) &curUsedBlock[1]) == memory_start){
break;
}
}
int res = -1; int res = -1;
if (entryPoint != 0) { if (entryPoint != 0) {
res = ((int (*)(int, char **)) entryPoint)(argc, argv); res = ((int (*)(int, char **)) entryPoint)(argc, argv);
@ -171,13 +190,13 @@ std::vector<std::string> readDirFull(const char *base_path, const char *path, FS
std::string PayloadSelectionScreen(const std::map<std::string, std::string> &payloads) { std::string PayloadSelectionScreen(const std::map<std::string, std::string> &payloads) {
int32_t screen_buf0_size = 0;
// Init screen and screen buffers // Init screen and screen buffers
OSScreenInit(); OSScreenInit();
screen_buf0_size = OSScreenGetBufferSizeEx(SCREEN_TV); uint32_t screen_buf0_size = OSScreenGetBufferSizeEx(SCREEN_TV);
OSScreenSetBufferEx(SCREEN_TV, (void *) 0xF4000000); uint32_t screen_buf1_size = OSScreenGetBufferSizeEx(SCREEN_DRC);
OSScreenSetBufferEx(SCREEN_DRC, (void *) (0xF4000000 + screen_buf0_size)); uint8_t * screenBuffer = (uint8_t*) memalign(0x100, screen_buf0_size + screen_buf1_size);
OSScreenSetBufferEx(SCREEN_TV, (void *)screenBuffer);
OSScreenSetBufferEx(SCREEN_DRC, (void *)(screenBuffer + screen_buf0_size));
OSScreenEnableEx(SCREEN_TV, 1); OSScreenEnableEx(SCREEN_TV, 1);
OSScreenEnableEx(SCREEN_DRC, 1); OSScreenEnableEx(SCREEN_DRC, 1);
@ -244,5 +263,6 @@ std::string PayloadSelectionScreen(const std::map<std::string, std::string> &pay
} }
i++; i++;
} }
free(screenBuffer);
return ""; return "";
} }