Merge pull request #1075 from yuriks/ControlMem-fixes

Fix heap-management regressions

1 files changed, 8 insertions, 0 deletions

diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 124047a53f..6279a4bf8f 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;