core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/dbui/mmoutputtypepage.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit b80001bbfd146fc62c491b78540216d41fd713f3
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Oct 18 20:50:08 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Oct 20 20:54:18 2024 +0200

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

diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx 
b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 27430ce63c60..c1ba1b3a2490 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -508,7 +508,13 @@ void SwSendMailDialog::UpdateTransferStatus()
     sStatus = m_sErrorStatus.replaceFirst("%1", 
OUString::number(m_nErrorCount) );
     m_xErrorStatus->set_label(sStatus);
 
-    if (!m_pImpl->aDescriptors.empty())
+    bool bEmpty;
+    {
+        std::scoped_lock aGuard(m_pImpl->aDescriptorMutex);
+        bEmpty = m_pImpl->aDescriptors.empty();
+    }
+
+    if (!bEmpty)
     {
         assert(m_nExpectedCount && "div-by-zero");
         m_xProgressBar->set_percentage(m_nProcessedCount * 100 / 
m_nExpectedCount);