Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7380

Browse Source 
8889f49 easylogging++: fix potential memory corruption (moneromooo-monero)
This commit is contained in:
luigi1111 2021-06-24 13:57:53 -05:00
commit e028591336
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external/easylogging++/easylogging++.cc vendored
View File

@ -714,9 +714,8 @@ Logger::Logger(const std::string& id, const Configurations& configurations,
} }
Logger::Logger(const Logger& logger) { Logger::Logger(const Logger& logger) {
base::utils::safeDelete(m_typedConfigurations);
m_id = logger.m_id; 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_parentApplicationName = logger.m_parentApplicationName;
m_isConfigured = logger.m_isConfigured; m_isConfigured = logger.m_isConfigured;
m_configurations = logger.m_configurations; m_configurations = logger.m_configurations;
@ -728,7 +727,7 @@ Logger& Logger::operator=(const Logger& logger) {
if (&logger != this) { if (&logger != this) {
base::utils::safeDelete(m_typedConfigurations); base::utils::safeDelete(m_typedConfigurations);
m_id = logger.m_id; 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_parentApplicationName = logger.m_parentApplicationName;
m_isConfigured = logger.m_isConfigured; m_isConfigured = logger.m_isConfigured;
m_configurations = logger.m_configurations; m_configurations = logger.m_configurations;