core.git: ucb/source

[Caolán McNamara (via logerrit)]

 ucb/source/sorter/sortresult.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1d4da92f7ce8026a5433822d9b8f5728a308bb75
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 14 22:02:25 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Dec 23 21:17:00 2024 +0100

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

diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index fbcf846f0ac1..e8019e3e5cb1 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1169,6 +1169,9 @@ void 
SortedResultSet::PropertyChangedImpl(std::unique_lock<std::mutex>& rGuard,
 
 void SortedResultSet::CopyData( SortedResultSet *pSource )
 {
+    std::unique_lock aGuard(maMutex);
+    std::unique_lock aSrcGuard(pSource->maMutex);
+
     const SortedEntryList& rSrcS2O = pSource->maS2O;
 
     sal_IntPtr i, nCount;