[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - svx/source

[Miklos Vajna (via logerrit)]

 svx/source/sdr/contact/viewcontact.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 478a6699584d2c837d7142e7c30279fb2d553d9d
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Dec 3 09:53:41 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Dec 9 12:22:31 2021 +0100

    svx: fix crash in ViewContact::ActionChanged()
    
    Crashreport:
    
            sdr::contact::ViewContact::ActionChanged()
                    svx/source/sdr/contact/viewcontact.cxx:197 (discriminator 2)
            
SdrTextObj::NbcSetOutlinerParaObjectForText(std::unique_ptr<OutlinerParaObject, 
std::default_delete<OutlinerParaObject> >, SdrText*)
                    svx/source/svdraw/svdotext.cxx:1379
            sdr::properties::TextProperties::ItemSetChanged(SfxItemSet const&)
                    /usr/include/c++/10/bits/unique_ptr.h:360
            sdr::properties::RectangleProperties::ItemSetChanged(SfxItemSet 
const&)
                    svx/source/sdr/properties/rectangleproperties.cxx:54
    
    Change-Id: I82de3e849cef33d207c8fd5e1c225de78d5f8705
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126562
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 85bc09d05f4824929d5b1381343c3ca75e7f6006)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126518
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/svx/source/sdr/contact/viewcontact.cxx 
b/svx/source/sdr/contact/viewcontact.cxx
index 0d1a9f0cb085..1723a6bb91e8 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -194,7 +194,10 @@ void ViewContact::ActionChanged()
         DBG_ASSERT(pCandidate,
                    "ViewContact::GetViewObjectContact() invalid 
ViewObjectContactList (!)");
 
-        pCandidate->ActionChanged();
+        if (pCandidate)
+        {
+            pCandidate->ActionChanged();
+        }
     }
 }