diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-03-02 08:19:39 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-03-02 17:09:05 +0100 |
| commit | 8eac5d41fc6d88d5e2942b693ab668f6933a7785 (patch) | |
| tree | 34292e16edf5cc0eb26d6507abe1d0b693a81c5e | |
| parent | ofz: don't read past end of record (diff) | |
| download | core-8eac5d41fc6d88d5e2942b693ab668f6933a7785.tar.gz core-8eac5d41fc6d88d5e2942b693ab668f6933a7785.zip | |
svx: the SdrObject of SvxGraphicObject can be nullptr
Crashreport:
Graphic::GetType() const
vcl/inc/impgraph.hxx:122
SvxGraphicObject::getPropertyValueImpl(rtl::OUString const&, SfxItemPropertySimpleEntry const*, com::sun::star::uno::Any&)
svx/source/unodraw/unoshap2.cxx:1466 (discriminator 1)
SvxShape::_getPropertyValue(rtl::OUString const&)
svx/source/unodraw/unoshape.cxx:1747
non-virtual thunk to SvxShape::getPropertyValue(rtl::OUString const&)
svx/source/unodraw/unoshape.cxx:1732
During SVG export of a selected shape.
Change-Id: I29b56d49b0c5418dfe8fec8491ac8667e5ade2ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130740
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130819
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit c1ce7d9f2c4036ae71f8cfa71e4bee4067f4d8d2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130849
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 5fa0596ef98c..046034f05550 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1459,7 +1459,8 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte Reference<graphic::XGraphic> xGraphic; auto pSdrGraphicObject = static_cast<SdrGrafObj*>(GetSdrObject()); - if (pSdrGraphicObject->GetGraphicObject().GetType() != GraphicType::NONE) + if (pSdrGraphicObject + && pSdrGraphicObject->GetGraphicObject().GetType() != GraphicType::NONE) xGraphic = pSdrGraphicObject->GetGraphic().GetXGraphic(); rValue <<= xGraphic; break; |