desktop/source/offacc/acceptor.cxx | 3 ++- sw/source/uibase/dbui/dbmgr.cxx | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 7cf55abcfe37a5ba76960b56c9b406cec380213d Author: Caolán McNamara <[email protected]> AuthorDate: Fri Dec 6 15:43:19 2024 +0000 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Dec 19 11:38:09 2024 +0100 cid#1608560 Data race condition Change-Id: I3b579434727e8b51d0de136c83d891c2f409d77a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178482 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 01f0676b9517af903abd7da041d8219e5df25eeb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178540 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 2c51a73c1199..dd90a0c88526 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -104,6 +104,8 @@ void Acceptor::run() SAL_INFO( "desktop.offacc", "Acceptor::run now enabled and continuing"); + std::unique_lock g(m_aMutex); + // accept connection Reference< XConnection > rConnection = m_rAcceptor->accept( m_aConnectString ); // if we return without a valid connection we must assume that the acceptor @@ -117,7 +119,6 @@ void Acceptor::run() // create the bridge. The remote end will have a reference to this bridge // thus preventing the bridge from being disposed. When the remote end releases // the bridge, it will be destructed. - std::unique_lock g(m_aMutex); m_bridges.add(m_rBridgeFactory->createBridge( u""_ustr, m_aProtocol, rConnection, rInstanceProvider)); } catch (const Exception&) { commit 6d68609062842b918db1188d2605aec512e09404 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Dec 7 14:39:38 2024 +0000 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Dec 19 11:38:01 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 <[email protected]> (cherry picked from commit 18399240f2aa976041db1928b1ae9db1a0ad706d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178562 Reviewed-by: Xisco Fauli <[email protected]> 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 );
