core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/dbui/dbmgr.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 18399240f2aa976041db1928b1ae9db1a0ad706d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 7 14:39:38 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Dec 8 14:02:45 2024 +0100

    cid#1607671 Data race condition
    
    Change-Id: Id2e87001b77087a072705ba7ffa1a2190220a082
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178074
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 757eba8c24c7..022104934d8c 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1129,7 +1129,10 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* 
pSourceShell,
         if( bMT_EMAIL )
         {
             // Reset internal mail accounting data
-            m_pImpl->m_xLastMessage.clear();
+            {
+                std::unique_lock aGuard(m_pImpl->m_aAllEmailSendMutex);
+                m_pImpl->m_xLastMessage.clear();
+            }
 
             xMailDispatcher.set( new 
MailDispatcher(rMergeDescriptor.xSmtpServer) );
             xMailListener = new MailDispatcherListener_Impl( *this );