[Libreoffice-commits] core.git: 2 commits - sfx2/source sw/source

[Caolán McNamara (via logerrit)]

 sfx2/source/appl/flatpak.cxx     |    1 +
 sw/source/core/frmedt/fefly1.cxx |    9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit cdcebac3b5be695bcf390bda116f5a52209c0dd1
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 16 11:52:58 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 17 09:50:21 2022 +0200

    fetch GetMarkedSdrObj just once
    
    Change-Id: I1af5326be2e71a5fe466b153177904907c12b7da
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138387
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 6ade7c6bb556..a63daab5e7ab 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -428,11 +428,14 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, 
bool bMoveIt )
         return aRet;
 
     const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkedObjectList();
-    if ( rMrkList.GetMarkCount() != 1 ||
-         !GetUserCall(rMrkList.GetMark( 0 )->GetMarkedSdrObj()) )
+    if (rMrkList.GetMarkCount() != 1)
+        return aRet;
+
+    SdrObject* pObj = rMrkList.GetMark(0)->GetMarkedSdrObj();
+
+    if (!GetUserCall(pObj))
         return aRet;
 
-    SdrObject* pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
     // #i28701#
     SwAnchoredObject* pAnchoredObj = ::GetUserCall( pObj )->GetAnchoredObj( 
pObj );
     SwFrameFormat& rFormat = pAnchoredObj->GetFrameFormat();
commit 2f3c3b8a205495df74e809f4167aa51400e5af89
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 16 11:12:49 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 17 09:50:04 2022 +0200

    cid#1500682 silence Untrusted loop bound
    
    Change-Id: I61900c89329b84ca07da09085be08a735569e392
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138386
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sfx2/source/appl/flatpak.cxx b/sfx2/source/appl/flatpak.cxx
index 14411dafc5d0..ab210632fed8 100644
--- a/sfx2/source/appl/flatpak.cxx
+++ b/sfx2/source/appl/flatpak.cxx
@@ -43,6 +43,7 @@ bool flatpak::createTemporaryHtmlDirectory(OUString ** url) {
     assert(url != nullptr);
     DBG_TESTSOLARMUTEX();
     if (!temporaryHtmlDirectoryStatus.created) {
+        // coverity[tainted_data] - we trust the contents of this variable
         auto const env = std::getenv("XDG_CACHE_HOME");
         if (env == nullptr) {
             SAL_WARN("sfx.appl", "LIBO_FLATPAK mode but unset XDG_CACHE_HOME");