Prevent a possible 'use after free' fault when using AsyncAppender (#397

) * Prefer thread_local over APR * Provide a minimal Optional for C++11 * Document ThreadSpecificData methods * Update the change report
apache · Jul 24, 2024 · d925a2e · d925a2e
1 parent 1c1cd79
commit d925a2e
Show file tree

Hide file tree

Showing 11 changed files with 330 additions and 265 deletions.
diff --git a/src/main/cpp/asyncappender.cpp b/src/main/cpp/asyncappender.cpp
@@ -282,12 +282,8 @@ void AsyncAppender::append(const spi::LoggingEventPtr& event, Pool& p)
 		priv->appenders.appendLoopOnAppenders(event, p);
 	}
 
-	// Set the NDC and MDC for the calling thread as these
-	// LoggingEvent fields were not set at event creation time.
-	LogString ndcVal;
-	event->getNDC(ndcVal);
-	// Get a copy of this thread's MDC.
-	event->getMDCCopy();
+	// Get a copy of this thread's diagnostic context
+	event->LoadDC();
 
 	if (!priv->dispatcher.joinable())
 	{