diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-26 06:38:26 -0300 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-26 21:29:05 -0300 |
commit | 12390eb155c055884f183cc547473a1dd92ff667 (patch) | |
tree | 4029327dd7e7bb2f4cf1243a3950a49168ceb69b /src | |
parent | 687d9739802097703a09f63d20ece741932b431b (diff) |
Kernel: Fix assertion failure when ControlMemory is called with size=0
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/kernel/process.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 124047a53..6279a4bf8 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -174,6 +174,10 @@ ResultCode Process::HeapFree(VAddr target, u32 size) { return ERR_INVALID_ADDRESS; } + if (size == 0) { + return RESULT_SUCCESS; + } + ResultCode result = vm_manager.UnmapRange(target, size); if (result.IsError()) return result; @@ -226,6 +230,10 @@ ResultCode Process::LinearFree(VAddr target, u32 size) { return ERR_INVALID_ADDRESS; } + if (size == 0) { + return RESULT_SUCCESS; + } + VAddr heap_end = GetLinearHeapBase() + (u32)linheap_memory->size(); if (target + size > heap_end) { return ERR_INVALID_ADDRESS_STATE; |