[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b462870a3a5053b1efd507960c2d0d2a13a838c7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 12 13:59:36 2017 +0100

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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)