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

Michael Stahl (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 19 18:37:37 UTC 2021


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

New commits:
commit a1ecf71fd7d3a011419a110e6e85bd0d32492f75
Author:     Michael Stahl <michael.stahl at allotropia.de>
AuthorDate: Fri Apr 16 16:21:26 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Apr 19 20:37:02 2021 +0200

    svx: fix crash in DefaultProperties::dumpAsXml()
    
    mpItemSet can be null
    
    Change-Id: I4192f84639116c550bba5303a5fc70528cb3e8c3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114263
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    (cherry picked from commit 832b23d9376019619929764606276aacde1e329a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114273
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 587e9a652454..fa5e2beba858 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -246,7 +246,10 @@ namespace sdr::properties
         {
             xmlTextWriterStartElement(pWriter, BAD_CAST("DefaultProperties"));
             BaseProperties::dumpAsXml(pWriter);
-            mpItemSet->dumpAsXml(pWriter);
+            if (mpItemSet)
+            {
+                mpItemSet->dumpAsXml(pWriter);
+            }
             xmlTextWriterEndElement(pWriter);
         }
 } // end of namespace


More information about the Libreoffice-commits mailing list