From 12390eb155c055884f183cc547473a1dd92ff667 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 26 Aug 2015 06:38:26 -0300 Subject: Kernel: Fix assertion failure when ControlMemory is called with size=0 --- src/core/hle/kernel/process.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) 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; -- cgit v1.2.3