From ff5f2c8dd6130891aac6b945ae39ee803b3720c0 Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Tue, 21 Mar 2017 08:58:11 +0000 Subject: [PATCH] Fix potential double free --- src/Common/Win32/EmuShared.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Common/Win32/EmuShared.cpp b/src/Common/Win32/EmuShared.cpp index f543ead2b..38ed67033 100644 --- a/src/Common/Win32/EmuShared.cpp +++ b/src/Common/Win32/EmuShared.cpp @@ -122,11 +122,13 @@ void EmuShared::Init() // ****************************************************************** void EmuShared::Cleanup() { - if(--(g_EmuShared->m_RefCount) <= 0) - g_EmuShared->EmuShared::~EmuShared(); + if (g_EmuShared != nullptr) { + if (--(g_EmuShared->m_RefCount) <= 0) + g_EmuShared->EmuShared::~EmuShared(); - UnmapViewOfFile(g_EmuShared); - g_EmuShared = nullptr; + UnmapViewOfFile(g_EmuShared); + g_EmuShared = nullptr; + } } // ******************************************************************