summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-21 12:59:50 +0100
committerAndras Timar <andras.timar@collabora.com>2014-08-21 21:24:52 +0200
commita90484bfd7ea5dd0d38ce4b19e616daef64360d8 (patch)
treeb1337268b0558d3eca284d311928070fbadf00d6 /sw
parentae8fa3021814f81a08c9f5aadd2c57519400192e (diff)
avoid crash on document ending before contained table ends
Change-Id: I003b7e00673cd5a4b4f0ed5218e2d30cfef04ffb (cherry picked from commit 5a2123376dc010ca4e3f0a19d7dbbfaeb25ea963) Reviewed-on: https://gerrit.libreoffice.org/11057 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e8b2dbc74286..6580024c2f3f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5334,6 +5334,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;
}