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

[Caolán McNamara]

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

New commits:
commit efe7ae87c98eb472f5fb8cb3be9c1e00864d8f09
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 21 12:59:50 2014 +0100

    avoid crash on document ending before contained table ends
    
    Change-Id: I003b7e00673cd5a4b4f0ed5218e2d30cfef04ffb
    (cherry picked from commit 5a2123376dc010ca4e3f0a19d7dbbfaeb25ea963)
    Reviewed-on: https://gerrit.libreoffice.org/11056
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index d9335411..a775e71 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5348,6 +5348,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
 
     UpdatePageDescs(rDoc, nPageDescOffset);
 
+    SAL_WARN_IF(mpTableEndPaM, "sw.ww8", "document ended without table ending");
+    mpTableEndPaM.reset();  //ensure this is deleted before pPaM
     delete pPaM, pPaM = 0;
     return nErrRet;
 }