From 50fd7bbc2d5210a3e520707f4e693660d4eefd16 Mon Sep 17 00:00:00 2001 From: Petr Benes Date: Sun, 5 Jan 2020 17:07:40 +0100 Subject: [PATCH] add check if hypervisor_allocator() exists in the generic_free() method This fixes crash that occurred if memory was freed/deleted before the hypervisor_allocator is initialized. --- src/hvpp/hvpp/lib/mm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hvpp/hvpp/lib/mm.cpp b/src/hvpp/hvpp/lib/mm.cpp index a814f0e..2974d34 100644 --- a/src/hvpp/hvpp/lib/mm.cpp +++ b/src/hvpp/hvpp/lib/mm.cpp @@ -126,7 +126,7 @@ namespace detail void generic_free(void* address) noexcept { - return mm::hypervisor_allocator()->contains(address) + return (mm::hypervisor_allocator() && mm::hypervisor_allocator()->contains(address)) ? mm::hypervisor_allocator()->free(address) : mm::system_allocator()->free(address); }