[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit f1b0679287a13c184f45c43e51ea3fa4d8fd4c31
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 15 21:21:28 2018 +0000

    ofz#5347 Indirect-leak
    
    Change-Id: I4eb18c7ee52b29de9fabb555ad59cd9051d376b2
    Reviewed-on: https://gerrit.libreoffice.org/47922
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index eb3ff52f1a4c..6551a41bd73c 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2607,7 +2607,13 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
 
     OSL_ENSURE(pRecord, "how did that happen?");
     if (!pRecord)
+    {
+        // remove old object from the Z-Order list
+        m_xMSDffManager->RemoveFromShapeOrder(pObject);
+        // and delete the object
+        SdrObject::Free(pObject);
         return nullptr;
+    }
 
     const bool bLayoutInTableCell =
         m_nInTable && IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell );