The-Homebrew-Cloud/WUMSLoader
2
0
Fork 0
mirror of https://github.com/wiiu-env/WUMSLoader.git synced 2024-12-25 23:51:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Memset every buffer allocated on the default heap before freeing

Browse Source
This commit is contained in:
Maschell 2023-03-26 15:55:36 +02:00
parent f7f8b007fa
commit 1f7d853d65
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wumsloader/src/fs/FileUtils.cpp
View File

@ -1,4 +1,5 @@
#include "utils/logger.h"
#include "utils/utils.h"
#include <coreinit/memdefaultheap.h>
#include <cstdint>
#include <fcntl.h>
@ -6,9 +7,6 @@
#include <string>
#include <unistd.h>
#define ROUNDDOWN(val, align) ((val) & ~(align - 1))
#define ROUNDUP(val, align) ROUNDDOWN(((val) + (align - 1)), align)
int32_t LoadFileToMem(const std::string &filepath, uint8_t **inbuffer, uint32_t *size) {
//! always initialze input
*inbuffer = nullptr;
@ -47,6 +45,7 @@ int32_t LoadFileToMem(const std::string &filepath, uint8_t **inbuffer, uint32_t
::close(iFd);
if (done != filesize) {
memset(buffer, 0, ROUNDUP(filesize, 0x40));
free(buffer);
buffer = nullptr;
return -3;

7
wumsloader/src/module/ModuleDataFactory.cpp
View File

@ -45,7 +45,12 @@ std::optional<std::shared_ptr<ModuleData>> ModuleDataFactory::load(const std::st
return {};
}
auto cleanupBuffer = onLeavingScope([buffer]() { MEMFreeToDefaultHeap(buffer); });
auto cleanupBuffer = onLeavingScope([buffer, fsize]() {
// Some games (e.g. Minecraft) expect the default heap to be empty.
// Make sure to clean up the memory after using it
memset(buffer, 0, ROUNDUP(fsize, 0x40));
MEMFreeToDefaultHeap(buffer);
});
// Load ELF data
if (!reader.load(reinterpret_cast<char *>(buffer), fsize)) {

2
wumsloader/src/utils/utils.h
View File

@ -2,6 +2,8 @@
#include <memory>
#include <vector>
#define ROUNDDOWN(val, align) ((val) & ~(align - 1))
#define ROUNDUP(val, align) ROUNDDOWN(((val) + (align - 1)), align)
template<class T, class... Args>
std::unique_ptr<T> make_unique_nothrow(Args &&...args) noexcept(noexcept(T(std::forward<Args>(args)...))) {