fix leak during memory shutdown.

aliaspider · Mar 26, 2023 · 4461ea8 · 4461ea8
1 parent 42411ca
commit 4461ea8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/libretro/main.cpp b/libretro/main.cpp
@@ -586,7 +586,10 @@ bool retro_load_game(const struct retro_game_info* game)
 	CommonHost::LoadStartupSettings();
 
 	if (!VMManager::Internal::InitializeGlobals() || !VMManager::Internal::InitializeMemory())
-		pxFailRel("Failed to allocate memory map");
+	{
+		log_cb(RETRO_LOG_ERROR, "Failed to allocate memory map");
+		return false;
+	}
 
 	VMManager::LoadSettings();
 

diff --git a/pcsx2/VirtualMemory.cpp b/pcsx2/VirtualMemory.cpp
@@ -286,6 +286,7 @@ void VirtualMemoryReserve::Release()
 		return;
 
 	m_allocator->Free(m_baseptr, m_size);
+	m_allocator.reset();
 	m_baseptr = nullptr;
 	m_size = 0;
 }