[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-3' - oox/source

[nd101 (via logerrit)]

 oox/source/drawingml/shape.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 24233efeae559cb3d4c1299e424705b81d82c278
Author:     nd101 <f...@nd.com.cn>
AuthorDate: Wed Mar 25 13:43:32 2020 +0800
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Apr 1 10:42:04 2020 +0200

    tdf#131553 a null pointer crashes Impress
    
    When constructing a shape object from property EmbeddedObject,
    it may return null object. Check the returned value first.
    
    Change-Id: I9d7a2d9c0c919007ae2a34a0af86dea5639b1bd6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91024
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit df1be683ab935fe5362750360508ba69eb415afb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90959
    Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
    (cherry picked from commit 3142872bcba19b6c4d60b464fc9b14293860348d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91174
    Reviewed-by: Michael Stahl <michael.st...@cib.de>
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f1da411ec4af..cce8b9ba7bbc 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -944,11 +944,14 @@ Reference< XShape > const & Shape::createAndInsert(
             xSet->setPropertyValue("CLSID", uno::makeAny(name.GetHexName()));
             uno::Reference<embed::XEmbeddedObject> const xObj(
                 xSet->getPropertyValue("EmbeddedObject"), uno::UNO_QUERY);
-            uno::Reference<uno::XInterface> const 
xMathModel(xObj->getComponent());
-            oox::FormulaImportBase *const pMagic(
-                    dynamic_cast<oox::FormulaImportBase*>(xMathModel.get()));
-            assert(pMagic);
-            pMagic->readFormulaOoxml(*pMathXml);
+            if (xObj.is())
+            {
+                uno::Reference<uno::XInterface> const 
xMathModel(xObj->getComponent());
+                oox::FormulaImportBase *const pMagic(
+                        
dynamic_cast<oox::FormulaImportBase*>(xMathModel.get()));
+                assert(pMagic);
+                pMagic->readFormulaOoxml(*pMathXml);
+            }
         }
 
         const GraphicHelper& rGraphicHelper = rFilterBase.getGraphicHelper();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits