oox/source/drawingml/shape.cxx | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 8c0f424a131dbb2e5f82ec27362d5c3cbfc4b92d
Author: nd101 <f...@nd.com.cn>
AuthorDate: Wed Mar 25 13:43:32 2020 +0800
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Mar 27 10:57:16 2020 +0100
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/+/90962
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index e061902096f6..6336bd04652d 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -936,11 +936,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
