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

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d757051f1c0c6a1b3239dcf0d1c6c7e20392d20b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 21 11:19:45 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Apr 21 14:08:20 2021 +0200

    cid#1476300 Dereference after null check
    
    Change-Id: Ib41b7bd60938aea997187aa3d2d6f9ea319fafc8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114391
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b5adf79a6b3b..963ee43d65af 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -688,10 +688,10 @@ OUString lcl_getDragParameterString( const OUString& rCID )
 bool SdrMarkView::dumpGluePointsToJSON(boost::property_tree::ptree& rTree)
 {
     bool result = false;
-    if (OutputDevice* rOutDev = mpMarkedPV->GetView().GetFirstOutputDevice())
+    if (OutputDevice* pOutDev = mpMarkedPV ? mpMarkedPV->GetView().GetFirstOutputDevice() : nullptr)
     {
         bool bConvertUnit = false;
-        if (rOutDev->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
+        if (pOutDev->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
             bConvertUnit = true;
         const SdrObjList* pOL = mpMarkedPV->GetObjList();
         if (!pOL)