Prevent use of thread specific data after destruction

apache · Nov 6, 2024 · 2a01934 · 2a01934
1 parent 00d73bf
commit 2a01934
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/main/cpp/threadspecificdata.cpp b/src/main/cpp/threadspecificdata.cpp
@@ -38,15 +38,10 @@ using namespace LOG4CXX_NS::helpers;
 struct ThreadSpecificData::ThreadSpecificDataPrivate{
 	ThreadSpecificDataPrivate()
 		: pNamePair(std::make_shared<NamePair>())
-		, isValid(true)
 	{
 		setThreadIdName();
 		setThreadUserName();
 	}
-	~ThreadSpecificDataPrivate()
-	{
-		isValid = false;
-	}
 	NDC::Stack ndcStack;
 	MDC::Map mdcMap;
 
@@ -64,8 +59,6 @@ struct ThreadSpecificData::ThreadSpecificDataPrivate{
 
 	void setThreadIdName();
 	void setThreadUserName();
-
-	bool isValid; // Is this object un-destructed?
 };
 
 /* Generate an identifier for the current thread
@@ -192,7 +185,7 @@ ThreadSpecificData* ThreadSpecificData::getCurrentData()
 {
 #if LOG4CXX_HAS_THREAD_LOCAL
 	thread_local ThreadSpecificData data;
-	return data.m_priv && data.m_priv->isValid ? &data : NULL;
+	return data.m_priv ? &data : NULL;
 #elif APR_HAS_THREADS
 	void* pData = NULL;
 	if (APR_SUCCESS == apr_threadkey_private_get(&pData, APRInitializer::getTlsKey())

diff --git a/src/test/cpp/ndctestcase.cpp b/src/test/cpp/ndctestcase.cpp
@@ -27,6 +27,7 @@
 static log4cxx::NDC ndc("ndctest");
 
 using namespace log4cxx;
+
 LOGUNIT_CLASS(NDCTestCase)
 {
 	static File TEMP;