LogManager: Check if listener is valid before using it

dolphin-emu · Jun 17, 2017 · dd8dcdf · dd8dcdf
1 parent a2ad3e1
commit dd8dcdf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
@@ -164,7 +164,8 @@ void LogManager::LogWithFullPath(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE
       LogTypes::LOG_LEVEL_TO_CHAR[(int)level], log->GetShortName().c_str(), temp);
 
   for (auto listener_id : *log)
-    m_listeners[listener_id]->Log(level, msg.c_str());
+    if (m_listeners[listener_id])
+      m_listeners[listener_id]->Log(level, msg.c_str());
 }
 
 void LogManager::Init()

diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h
@@ -86,7 +86,7 @@ class LogManager : NonCopyable
 private:
   LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS];
   static LogManager* m_logManager;  // Singleton. Ugh.
-  std::array<LogListener*, LogListener::NUMBER_OF_LISTENERS> m_listeners;
+  std::array<LogListener*, LogListener::NUMBER_OF_LISTENERS> m_listeners{};
   size_t m_path_cutoff_point = 0;
 
   LogManager();