Prevent use of thread specific data after destruction

apache · Nov 6, 2024 · 3cc9e94 · 3cc9e94
1 parent ffff7db
commit 3cc9e94
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/cpp/threadspecificdata.cpp b/src/main/cpp/threadspecificdata.cpp
@@ -149,6 +149,7 @@ ThreadSpecificData::ThreadSpecificData(ThreadSpecificData&& other)
 
 ThreadSpecificData::~ThreadSpecificData()
 {
+    m_priv.reset();
 }
 
 NDC::Stack& ThreadSpecificData::getStack()

diff --git a/src/main/include/log4cxx/helpers/threadspecificdata.h b/src/main/include/log4cxx/helpers/threadspecificdata.h
@@ -38,7 +38,7 @@ class LOG4CXX_EXPORT ThreadSpecificData
 
 		/**
 		 *  Gets current thread specific data.
-		 *  @return a pointer that is never null.
+		 *  @return a pointer that is non-null prior to application exit.
 		 */
 		static ThreadSpecificData* getCurrentData();