core.git: 2 commits - desktop/source sw/source

[Caolán McNamara (via logerrit)]

 desktop/source/lib/init.cxx      |    5 +++--
 sw/source/core/layout/tabfrm.cxx |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit df9f56259c52b21340a1429fa796e0aff1917a6d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 28 11:03:37 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Dec 28 15:10:45 2024 +0100

    cid#1637330 silence Dereference after null check
    
    Change-Id: I0c6585d8ff29689d79b0614c26c7b15502d947fd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179489
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 929bfa806fd8..9b2590b88ec7 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -440,6 +440,7 @@ static void lcl_MoveRowContent( SwRowFrame& rSourceLine, 
SwRowFrame& rDestLine )
     // Move content of follow cells into master cells
     while ( pCurrSourceCell )
     {
+        assert(pCurrDestCell);
         SwFrame* pLower = pCurrSourceCell->Lower();
         if ( pLower && pLower->IsRowFrame() )
         {
@@ -482,7 +483,7 @@ static void lcl_MoveRowContent( SwRowFrame& rSourceLine, 
SwRowFrame& rDestLine )
             {
                 // NEW TABLES
                 SwCellFrame* pDestCell = pCurrDestCell;
-                if ( pDestCell && pDestCell->GetTabBox()->getRowSpan() < 1 )
+                if ( pDestCell->GetTabBox()->getRowSpan() < 1 )
                     pDestCell = & 
const_cast<SwCellFrame&>(pDestCell->FindStartEndOfRowSpanCell( true ));
 
                 // Find last content
commit 85be6c20ee99382a2d59d08688cb11aed016f043
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Dec 28 10:59:30 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Dec 28 15:10:39 2024 +0100

    cid#1637331 silence Using invalid iterator
    
    Change-Id: Ia706dbbb397f80069bace68e831b082de11d8557
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179488
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9f42a3524707..389225e4fc31 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7693,8 +7693,9 @@ static void lo_setDocumentPassword(LibreOfficeKit* pThis,
     assert(pThis);
     assert(pURL);
     LibLibreOffice_Impl *const pLib = static_cast<LibLibreOffice_Impl*>(pThis);
-    assert(pLib->mInteractionMap.contains(OString(pURL)));
-    pLib->mInteractionMap.find(OString(pURL))->second->SetPassword(pPassword);
+    auto it = pLib->mInteractionMap.find(OString(pURL));
+    assert(it != pLib->mInteractionMap.end());
+    it->second->SetPassword(pPassword);
 }
 
 static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER LibreOfficeKit* /*pThis*/)