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

[Caolán McNamara (via logerrit)]

 sw/source/core/access/accmap.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit bdc753d06f1306877f8adfffd0f86be7a1a1f754
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Aug 20 10:40:15 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Aug 20 13:06:24 2022 +0200

    cid#1500474 rearrange to avoid Dereference after null check
    
    Change-Id: I0cb4a8bc80b73fe6048540fc368096131ae0c231
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138575
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index c26a9eb22bee..2cb76f862e6c 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2773,14 +2773,14 @@ void SwAccessibleMap::InvalidateRelationSet_( const 
SwFrame* pFrame,
     {
         osl::MutexGuard aGuard( maMutex );
 
-        if( mpFrameMap )
+        if (!mpFrameMap)
+            return;
+
+        SwAccessibleContextMap_Impl::iterator aIter =
+                                mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+        if( aIter != mpFrameMap->end() )
         {
-            SwAccessibleContextMap_Impl::iterator aIter =
-                                    mpFrameMap->find( aFrameOrObj.GetSwFrame() 
);
-            if( aIter != mpFrameMap->end() )
-            {
-                xAcc = (*aIter).second;
-            }
+            xAcc = (*aIter).second;
         }
     }