[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 2cbc6791a27c4b63639888162f97ace2352eacf2
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 22 09:50:56 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 22 12:57:54 2022 +0200

    cid#1500675 return early to silence Dereference after null check
    
    Change-Id: If43b82c9db4517e24cc3c6d8b61a38624e6243b6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138663
    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 2cb76f862e6c..e191c5cd8b4e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2834,14 +2834,14 @@ void SwAccessibleMap::InvalidateParaTextSelection( 
const SwTextFrame& _rTextFram
     {
         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;
         }
     }