sc/source/filter/excel/impop.cxx | 2 +- sd/source/console/PresenterTimer.cxx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 646e4cfa4f8f1858d8ab762594f60a9c91cf19e4 Author: Noel Grandin <[email protected]> AuthorDate: Wed Oct 9 19:51:42 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Oct 10 10:52:59 2024 +0200 cid#1555929 Data race condition Change-Id: I6748cdb95f4bcca12d6b3201ef2ff077e87081b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174746 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sd/source/console/PresenterTimer.cxx b/sd/source/console/PresenterTimer.cxx index 232c82bafa27..cffb2dc738fc 100644 --- a/sd/source/console/PresenterTimer.cxx +++ b/sd/source/console/PresenterTimer.cxx @@ -96,7 +96,11 @@ public: static void NotifyTermination(); #if !defined NDEBUG - static bool HasInstance() { return mpInstance != nullptr; } + static bool HasInstance() + { + std::scoped_lock aGuard (maInstanceMutex); + return mpInstance != nullptr; + } #endif private: commit 0216369a736a83bc9440c24220c803127e671c5c Author: Noel Grandin <[email protected]> AuthorDate: Wed Oct 9 19:29:50 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Oct 10 10:52:50 2024 +0200 cid#1606699 Overflowed constant Change-Id: Ibd5179a015c2aa82111badb6d181294435b8ef21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174742 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 323ed830b301..38159100c589 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -246,7 +246,7 @@ void ImportExcel::ReadDimensions() nXclRow2 = maStrm.ReaduInt32(); aXclUsedArea.maFirst.mnCol = maStrm.ReaduInt16(); aXclUsedArea.maLast.mnCol = maStrm.ReaduInt16(); - if( (nXclRow1 < nXclRow2) && (aXclUsedArea.GetColCount() > 1) && + if( nXclRow2 != 0 && (nXclRow1 < nXclRow2) && (aXclUsedArea.GetColCount() > 1) && (nXclRow1 <= o3tl::make_unsigned( GetScMaxPos().Row() )) ) { // Excel stores first unused row/column index
