diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-06-24 13:57:53 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-06-24 13:57:53 -0500 |
| commit | e0285913365c1af17af7aef2d174d2601a7bb810 (patch) | |
| tree | 6b0211e5a53cc35cb3a29b3573d46cf2bd8ac7ab /external/easylogging++ | |
| parent | 282e2ef058823e628ec4ca317d34d1e5672e074e (diff) | |
| parent | 8889f490ce8e4fc0e7f7b9c47f8ef46f5a509cf3 (diff) | |
| download | monzero-core-e0285913365c1af17af7aef2d174d2601a7bb810.tar.gz monzero-core-e0285913365c1af17af7aef2d174d2601a7bb810.tar.xz monzero-core-e0285913365c1af17af7aef2d174d2601a7bb810.zip | |
Merge pull request #7380
8889f49 easylogging++: fix potential memory corruption (moneromooo-monero)
Diffstat (limited to 'external/easylogging++')
| -rw-r--r-- | external/easylogging++/easylogging++.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index f1722f0a1..267770074 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -714,9 +714,8 @@ Logger::Logger(const std::string& id, const Configurations& configurations, } Logger::Logger(const Logger& logger) { - base::utils::safeDelete(m_typedConfigurations); m_id = logger.m_id; - m_typedConfigurations = logger.m_typedConfigurations; + m_typedConfigurations = logger.m_typedConfigurations ? new base::TypedConfigurations(*logger.m_typedConfigurations) : nullptr; m_parentApplicationName = logger.m_parentApplicationName; m_isConfigured = logger.m_isConfigured; m_configurations = logger.m_configurations; @@ -728,7 +727,7 @@ Logger& Logger::operator=(const Logger& logger) { if (&logger != this) { base::utils::safeDelete(m_typedConfigurations); m_id = logger.m_id; - m_typedConfigurations = logger.m_typedConfigurations; + m_typedConfigurations = logger.m_typedConfigurations ? new base::TypedConfigurations(*logger.m_typedConfigurations) : nullptr; m_parentApplicationName = logger.m_parentApplicationName; m_isConfigured = logger.m_isConfigured; m_configurations = logger.m_configurations; |