summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-05-12 13:59:36 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-12 14:01:43 +0100
commit858d1e065530997a695dc303b9224fd136137c8d (patch)
treef659245198a874512fc9dedbbf28bdf090119b99
parentb5302844af49cc25c0720f3c2dccbdc0380d3b50 (diff)
Resolves: tdf#107786 crash on null pointer access
Change-Id: I371d509e7ab6e7e0ef757e302d54ab75aa6c4c9b
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 3b9c9c54231c..16525583f557 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4301,7 +4301,7 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection,
tools::Rectangle aRect(0, 0, 100, 100); // A dummy, we don't care about the size
SvxMSDffImportData aData(aRect);
SdrObject* pObject = nullptr;
- if (mrReader.m_pMSDffManager->GetShape(0x401, pObject, aData))
+ if (mrReader.m_pMSDffManager->GetShape(0x401, pObject, aData) && !aData.empty())
{
// Only handle shape if it is a background shape
if (((*aData.begin())->nFlags & 0x400) != 0)