summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/ssfrm.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-07-02 14:10:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-07-02 14:12:35 +0100
commitcd173f7718422b254ed4ec6548c7c913409d0c36 (patch)
treed1bf976b6b8cec14d0ae9f59d96092449d93ce1b /sw/source/core/layout/ssfrm.cxx
parent813f3436eaca46087e35912719a5cc198712714b (diff)
crashtest: don't crash on layout of ooo70429-[1|2]
Invalid read of size 8 at 0x2DF1B82A: SwFlowFrm::HasFollow() const (flowfrm.hxx:163) by 0x2E3F80BF: CalcContent(SwLayoutFrm*, bool, bool) (fly.cxx:1652) by 0x2E49A960: SwSectionFrm::_CheckClipping(bool, bool) (sectfrm.cxx:1037) Address 0x20c1f978 is 248 bytes inside a block of size 288 free'd by 0x2E497284: SwSectionFrm::~SwSectionFrm() (sectfrm.cxx:153) by 0x2E4B0D1C: SwFrm::DestroyFrm(SwFrm*) (ssfrm.cxx:390) by 0x2E4B1485: SwLayoutFrm::DestroyImpl() (ssfrm.cxx:499) by 0x2E4B0CD3: SwFrm::DestroyFrm(SwFrm*) (ssfrm.cxx:388) by 0x2E4B1485: SwLayoutFrm::DestroyImpl() (ssfrm.cxx:499) by 0x2E454CC6: SwPageFrm::DestroyImpl() (pagechg.cxx:270) by 0x2E4B0CD3: SwFrm::DestroyFrm(SwFrm*) (ssfrm.cxx:388) by 0x2E458237: SwFrm::InsertPage(SwPageFrm*, bool) (pagechg.cxx:1226) by 0x2E49CD8B: SwFrm::GetNextSctLeaf(MakePageType) (sectfrm.cxx:1564) by 0x2E3EB912: SwFrm::GetLeaf(MakePageType, bool) (flowfrm.cxx:785) by 0x2E3EE83E: SwFlowFrm::MoveFwd(bool, bool, bool) (flowfrm.cxx:1840) by 0x2E3D7CF0: SwContentFrm::MakeAll(OutputDevice*) (calcmove.cxx:1171) by 0x2E3D2E8B: SwFrm::PrepareMake(OutputDevice*) (calcmove.cxx:277) by 0x2E4CE31C: SwFrm::Calc(OutputDevice*) const (trvlfrm.cxx:1798) by 0x2E56E174: SwTextFrm::CalcFollow(int) (frmform.cxx:282) by 0x2E56F718: SwTextFrm::_AdjustFollow(SwTextFormatter&, int, int, unsigned char) (frmform.cxx:590) by 0x2E5716D3: SwTextFrm::FormatAdjust(SwTextFormatter&, WidowsAndOrphans&, int, bool) (frmform.cxx:1110) by 0x2E570A6E: SwTextFrm::CalcPreps() (frmform.cxx:892) by 0x2E574163: SwTextFrm::Format(OutputDevice*, SwBorderAttrs const*) (frmform.cxx:1767) by 0x2E3D8E4F: SwContentFrm::MakeAll(OutputDevice*) (calcmove.cxx:1337) by 0x2E3D319F: SwFrm::PrepareMake(OutputDevice*) (calcmove.cxx:340) by 0x2E4CE31C: SwFrm::Calc(OutputDevice*) const (trvlfrm.cxx:1798) by 0x2E3F77B7: CalcContent(SwLayoutFrm*, bool, bool) (fly.cxx:1466) by 0x2E49A960: SwSectionFrm::_CheckClipping(bool, bool) (sectfrm.cxx:1037) Change-Id: I089981eda62bff63782338b5210b78f69b6d5f0b
Diffstat (limited to 'sw/source/core/layout/ssfrm.cxx')
-rw-r--r--sw/source/core/layout/ssfrm.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index a29b09ea844d..4d21ba2edf04 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -374,6 +374,7 @@ void SwFrm::DestroyImpl()
SwFrm::~SwFrm()
{
assert(m_isInDestroy); // check that only DestroySwFrm does "delete"
+ assert(!IsDeleteForbidden()); // check that its not deleted while deletes are forbidden
#if OSL_DEBUG_LEVEL > 0
// JP 15.10.2001: for detection of access to deleted frames
mpDrawObjs = reinterpret_cast<SwSortedObjs*>(0x33333333);