diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2017-06-17 10:39:06 +0200 |
|---|---|---|
| committer | Léo Lam <leo@innovatetechnologi.es> | 2017-06-17 10:39:06 +0200 |
| commit | dd8dcdf880d81a599f478bb868a8e8a85d28e7fd (patch) | |
| tree | 327a55b0293688128abe37f189e03375d319fd87 /Source/Core | |
| parent | a2ad3e14d0d3c33b746638f49ba5567a503ce16d (diff) | |
LogManager: Check if listener is valid before using it
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Logging/LogManager.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/Common/Logging/LogManager.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index 484151023d..2aef9318e7 100644 --- 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 index 0ec3c1f7de..6562a17058 100644 --- 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(); |
