The-Homebrew-Cloud/libmocha
2
0
Fork 0
mirror of https://github.com/wiiu-env/libmocha.git synced 2024-11-12 15:05:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Free tmp_buf only when its needed

Browse Source
This commit is contained in:
Maniac- 2023-10-17 20:25:09 +03:00
parent 049f322e55
commit 0e75922c5b
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/utils.cpp
View File

@ -189,22 +189,24 @@ MochaUtilsStatus Mocha_IOSUMemoryRead(uint32_t address, uint8_t *out_buffer, uin
ALIGN_0x40 uint32_t io_buf[0x40 >> 2]; ALIGN_0x40 uint32_t io_buf[0x40 >> 2];
io_buf[0] = address; io_buf[0] = address;
void *tmp_buf = nullptr; void *tmp_buf = out_buffer;
if (((uintptr_t) out_buffer & 0x3F) || (size & 0x3F)) { if (((uintptr_t) out_buffer & 0x3F) || (size & 0x3F)) {
tmp_buf = (uint32_t *) memalign(0x40, ROUNDUP(size, 0x40)); tmp_buf = memalign(0x40, ROUNDUP(size, 0x40));
if (!tmp_buf) { if (!tmp_buf) {
return MOCHA_RESULT_OUT_OF_MEMORY; return MOCHA_RESULT_OUT_OF_MEMORY;
} }
} }
int res = IOS_Ioctl(iosuhaxHandle, IOCTL_MEM_READ, io_buf, sizeof(address), tmp_buf ? tmp_buf : out_buffer, size); int res = IOS_Ioctl(iosuhaxHandle, IOCTL_MEM_READ, io_buf, sizeof(address), tmp_buf, size);
if (res >= 0 && tmp_buf) { if (tmp_buf != out_buffer) {
memcpy(out_buffer, tmp_buf, size); if (res >= 0) {
memcpy(out_buffer, tmp_buf, size);
}
free(tmp_buf);
} }
free(tmp_buf);
return res >= 0 ? MOCHA_RESULT_SUCCESS : MOCHA_RESULT_UNKNOWN_ERROR; return res >= 0 ? MOCHA_RESULT_SUCCESS : MOCHA_RESULT_UNKNOWN_ERROR;
} }
@ -235,23 +237,25 @@ MochaUtilsStatus Mocha_IOSUKernelRead32(uint32_t address, uint32_t *out_buffer)
ALIGN_0x40 uint32_t io_buf[0x40 >> 2]; ALIGN_0x40 uint32_t io_buf[0x40 >> 2];
io_buf[0] = address; io_buf[0] = address;
void *tmp_buf = NULL; void *tmp_buf = out_buffer;
int32_t count = 1; int32_t count = 1;
if (((uintptr_t) out_buffer & 0x3F) || ((count * 4) & 0x3F)) { if (((uintptr_t) out_buffer & 0x3F) || ((count * 4) & 0x3F)) {
tmp_buf = (uint32_t *) memalign(0x40, ROUNDUP((count * 4), 0x40)); tmp_buf = memalign(0x40, ROUNDUP((count * 4), 0x40));
if (!tmp_buf) { if (!tmp_buf) {
return MOCHA_RESULT_OUT_OF_MEMORY; return MOCHA_RESULT_OUT_OF_MEMORY;
} }
} }
int res = IOS_Ioctl(iosuhaxHandle, IOCTL_KERN_READ32, io_buf, sizeof(address), tmp_buf ? tmp_buf : out_buffer, count * 4); int res = IOS_Ioctl(iosuhaxHandle, IOCTL_KERN_READ32, io_buf, sizeof(address), tmp_buf, count * 4);
if (res >= 0 && tmp_buf) { if (tmp_buf != out_buffer) {
memcpy(out_buffer, tmp_buf, count * 4); if (res >= 0) {
memcpy(out_buffer, tmp_buf, count * 4);
}
free(tmp_buf);
} }
free(tmp_buf);
return res >= 0 ? MOCHA_RESULT_SUCCESS : MOCHA_RESULT_UNKNOWN_ERROR; return res >= 0 ? MOCHA_RESULT_SUCCESS : MOCHA_RESULT_UNKNOWN_ERROR;
} }