diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-12 13:59:36 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-05-16 11:57:34 +0200 |
| commit | b462870a3a5053b1efd507960c2d0d2a13a838c7 (patch) | |
| tree | 4559be946d458cc48d342d01fb014da1730c6194 | |
| parent | 4820c9b981e060a55b3511272824dca7c2eb67d5 (diff) | |
Resolves: tdf#107786 crash on null pointer access
Change-Id: I371d509e7ab6e7e0ef757e302d54ab75aa6c4c9b
(cherry picked from commit 858d1e065530997a695dc303b9224fd136137c8d)
Reviewed-on: https://gerrit.libreoffice.org/37537
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index cf06fc768513..cd6213e5f26d 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4317,7 +4317,7 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection, 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) |