diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-10 11:14:38 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-07-10 15:53:35 +0200 |
| commit | acfbce0dd02d66f72bf4c1d54fa69b289edaf389 (patch) | |
| tree | a91bf3f11c4ed6ef14df8ce2f072f129c086aa6b | |
| parent | 7c67f92dd18c4f68d69216e3d865ba606545b00c (diff) | |
cid#1608592 Double lock
since:
commit 9301f4d486b13dac2a66b797d5e24eb6dc9f7582
Date: Thu Feb 16 14:31:25 2023 +0200
osl::Mutex->std::mutex in ResultSetDataSupplier
Change-Id: I6be50541e00f8f8de3bdebe1690e14e805bee14e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170281
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit 3374417097edcee8c8951fd1df6044e2d24b74a6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170292
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index 9930f80d6e3c..272349bd6e46 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -77,7 +77,7 @@ ResultSetDataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) } OUString -ResultSetDataSupplier::queryContentIdentifierStringImpl( std::unique_lock<std::mutex>& /*rGuard*/, sal_uInt32 nIndex ) +ResultSetDataSupplier::queryContentIdentifierStringImpl( std::unique_lock<std::mutex>& rGuard, sal_uInt32 nIndex ) { if ( nIndex < m_aResults.size() ) { @@ -89,7 +89,7 @@ ResultSetDataSupplier::queryContentIdentifierStringImpl( std::unique_lock<std::m } } - if ( getResult( nIndex ) ) + if ( getResultImpl(rGuard, nIndex) ) { // Note: getResult fills m_pImpl->m_aResults[ nIndex ]->aURL. return m_aResults[ nIndex ].aURL; |