summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2023-07-05 09:55:18 +0200
committerAndras Timar <andras.timar@collabora.com>2023-07-08 20:36:30 +0200
commitba498a05be02b59aa71416cc4a9313ab89b11532 (patch)
tree68d04d67b82c9e6659f00665cb3c438dcde33f1f /oox
parent5982cd82c4813899acaea47f6b6740bc87e7c01d (diff)
oox: fix crash in lcl_GetGluePointId
See https://crashreport.libreoffice.org/stats/signature/static%20long%20oox::drawingml::lcl_GetGluePointId(const%20class%20com::sun::star::uno::Reference%3Ccom::sun::star::drawing::XShape%3E%20&%20const,%20long) Regression from b7c542b5085374f1d031183cb86ceeefcf24964d "tdf#154363 sd: fix line connectors regression of mirrored shapes" Change-Id: I926d32f5b68582df588c28a800b0ec10e7e3e19f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154021 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 66fbe1fcc36b7ac67c4b06d7917705cd1171c2ea) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154031 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/shapes.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 2bf1fe11a6e9..48fb95145edd 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1672,7 +1672,8 @@ static sal_Int32 lcl_GetGluePointId(const Reference<XShape>& xShape, sal_Int32 n
bool bFlipH = false;
bool bFlipV = false;
Reference<XPropertySet> xShapeProps(xShape, UNO_QUERY);
- if (xShapeProps->getPropertySetInfo()->hasPropertyByName("CustomShapeGeometry"))
+ if (xShapeProps.is() && xShapeProps->getPropertySetInfo()
+ && xShapeProps->getPropertySetInfo()->hasPropertyByName("CustomShapeGeometry"))
{
Sequence<PropertyValue> aGeometrySeq;
xShapeProps->getPropertyValue("CustomShapeGeometry") >>= aGeometrySeq;