desktop/source/deployment/gui/dp_gui_dialog2.cxx | 3 ++- drawinglayer/source/tools/emfppath.cxx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit 0e76e830c234d72b1973cc5311285f178c93263c Author: Noel Grandin <[email protected]> AuthorDate: Sun Oct 6 21:48:14 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Oct 7 09:31:16 2024 +0200 cid#1606613 Overflowed constant Change-Id: I5340d46ef1264236c63bfd058e44dd984be2793c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174567 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/drawinglayer/source/tools/emfppath.cxx b/drawinglayer/source/tools/emfppath.cxx index e7c4a5512c76..cf841fd999e0 100644 --- a/drawinglayer/source/tools/emfppath.cxx +++ b/drawinglayer/source/tools/emfppath.cxx @@ -158,6 +158,7 @@ namespace emfplushelper { if (((i - last_normal )% 3) == 1) { + assert(p != 0); polygon.setNextControlPoint (p - 1, mapped); SAL_INFO ("drawinglayer.emf", "EMF+ Polygon append next: " << p - 1 << " mapped: " << mapped.getX () << "," << mapped.getY ()); continue; commit 0d0f2e7b1f6851b07e65b42aca40f37a5f311deb Author: Noel Grandin <[email protected]> AuthorDate: Sun Oct 6 21:38:10 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Oct 7 09:31:09 2024 +0200 cid#1606611 Data race condition and cid#1607663 Data race condition cid#1606843 Data race condition cid#1608340 Check of thread-shared field evades lock acquisition Change-Id: I97b82d4302ead6b96ae19c15502c427952df2ede Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174566 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 4fe7a9622545..2d978ce080f0 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -839,9 +839,9 @@ void ExtMgrDialog::showProgress( bool _bStart ) void ExtMgrDialog::updateProgress( const tools::Long nProgress ) { + std::unique_lock aGuard( m_aMutex ); if ( m_nProgress != nProgress ) { - std::unique_lock aGuard( m_aMutex ); m_nProgress = nProgress; m_aIdle.Start(); } @@ -945,6 +945,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn, weld::Button&, void) IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Timer *, void) { + std::unique_lock aGuard( m_aMutex ); if ( m_bStopProgress ) { m_bHasProgress = false;
