monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-22 19:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

easylogging++: fix crash with reentrant logging

Browse source
This commit is contained in:
moneromooo-monero 2020-07-29 17:03:21 +00:00
parent c02d7621a4
commit 5b761d0186
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
external/easylogging++/easylogging++.cc vendored
View file

@ -2968,6 +2968,16 @@ void Writer::initializeLogger(Logger *logger, bool needLock) {
} }
void Writer::processDispatch() { void Writer::processDispatch() {
static std::atomic_flag in_dispatch;
if (in_dispatch.test_and_set())
{
if (m_proceed && m_logger != NULL)
{
m_logger->stream().str(ELPP_LITERAL(""));
m_logger->releaseLock();
}
return;
}
#if ELPP_LOGGING_ENABLED #if ELPP_LOGGING_ENABLED
if (ELPP->hasFlag(LoggingFlag::MultiLoggerSupport)) { if (ELPP->hasFlag(LoggingFlag::MultiLoggerSupport)) {
bool firstDispatched = false; bool firstDispatched = false;
@ -3006,6 +3016,7 @@ void Writer::processDispatch() {
m_logger->releaseLock(); m_logger->releaseLock();
} }
#endif // ELPP_LOGGING_ENABLED #endif // ELPP_LOGGING_ENABLED
in_dispatch.clear();
} }
void Writer::triggerDispatch(void) { void Writer::triggerDispatch(void) {