From 25c0988b87b71f93577837f4a300f5f17366d145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 30 Apr 2018 15:31:51 +0100 Subject: [PATCH] ofz#8095 avoid recurse to death MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0acb0f68f64bb95a4510a330d463badd2cf8a84a Reviewed-on: https://gerrit.libreoffice.org/53663 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- lotuswordpro/qa/cppunit/data/fail/recurse-5.lwp | Bin 0 -> 21428 bytes lotuswordpro/source/filter/lwpcelllayout.cxx | 5 +++-- lotuswordpro/source/filter/lwpcelllayout.hxx | 16 +++++++++++++--- lotuswordpro/source/filter/lwprowlayout.cxx | 6 +++--- lotuswordpro/source/filter/lwptablelayout.cxx | 2 +- 5 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 lotuswordpro/qa/cppunit/data/fail/recurse-5.lwp diff --git a/lotuswordpro/qa/cppunit/data/fail/recurse-5.lwp b/lotuswordpro/qa/cppunit/data/fail/recurse-5.lwp new file mode 100644 index 0000000000000000000000000000000000000000..a81b42f61e95086e1357e21e164edd57652823c6 GIT binary patch literal 21428 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 QfH#;YVW{Wv`&<0}PkJy&6951J literal 0 HcmV?d00001 diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index ad80d4aa4048..2d25248c6af7 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -76,6 +76,7 @@ LwpCellLayout::LwpCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm) : LwpMiddleLayout(objHdr, pStrm) + , m_bConvertCell(false) , crowid(0) , ccolid(0) , cType(LDT_NONE) @@ -891,11 +892,11 @@ rtl::Reference LwpHiddenCellLayout::ConvertCell(LwpObjectID aTableID, sa LwpCellLayout *pDefault = dynamic_cast(pTable->GetDefaultCellStyle().obj().get()); if (pDefault) { - xXFCell = pDefault->ConvertCell(aTableID, nRow, nCol); + xXFCell = pDefault->DoConvertCell(aTableID, nRow, nCol); } else { - xXFCell = pConnCell->ConvertCell(aTableID, nRow, nCol); + xXFCell = pConnCell->DoConvertCell(aTableID, nRow, nCol); } xXFCell->SetColumnSpaned(pConnCell->GetNumcols()); } diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index 4969f568e9a1..5c54b92a1ffc 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -89,7 +89,15 @@ public: LwpCellLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm); virtual ~LwpCellLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_CELL_LAYOUT;} - virtual rtl::Reference ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol); + rtl::Reference DoConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) + { + if (m_bConvertCell) + throw std::runtime_error("recursion in page divisions"); + m_bConvertCell = true; + rtl::Reference aRet = ConvertCell(aTableID, nRow, nCol); + m_bConvertCell = false; + return aRet; + } sal_uInt16 GetRowID(){return crowid;} sal_uInt8 GetColID(){return ccolid;} void RegisterStyle() override; @@ -114,10 +122,12 @@ protected: OUString const & GetCellStyleName(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); void RegisterDefaultCell(); virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); + virtual rtl::Reference ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol); static LwpCellLayout * GetCellByRowCol(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); static sal_uInt16 GetLeftColID(sal_uInt16 nCol){return nCol - 1; }; virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow){return nRow + 1; }; + bool m_bConvertCell; sal_uInt16 crowid; sal_uInt8 ccolid; LwpObjectID cLayNumerics; @@ -147,11 +157,11 @@ public: virtual ~LwpHiddenCellLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_HIDDEN_CELL_LAYOUT;} virtual void Parse(IXFStream* pOutputStream) override; - virtual rtl::Reference ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) override; void RegisterStyle() override {} virtual void SetCellMap() override; private: void Read() override; + virtual rtl::Reference ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) override; LwpObjectID cconnectedlayout; }; @@ -166,7 +176,6 @@ public: virtual ~LwpConnectedCellLayout() override; virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_CONNECTED_CELL_LAYOUT;} virtual void Parse(IXFStream* pOutputStream) override; - virtual rtl::Reference ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) override; sal_uInt16 GetNumrows(){return m_nRealrowspan;} sal_uInt8 GetNumcols(){return m_nRealcolspan;} virtual void SetCellMap() override; @@ -175,6 +184,7 @@ protected: void Read() override; virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow) override {return nRow + m_nRealrowspan; }; virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) override; + virtual rtl::Reference ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) override; sal_uInt16 cnumrows; sal_uInt8 cnumcols; sal_uInt16 m_nRealrowspan; diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index e4d1fdf6c29b..a0a90a417c69 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -232,7 +232,7 @@ void LwpRowLayout::ConvertRow(rtl::Reference const & pXFTable,sal_uInt8 { sal_uInt8 nColID = m_ConnCellList[nMarkConnCell]->GetColID() +m_ConnCellList[nMarkConnCell]->GetNumcols()-1; - xXFCell = m_ConnCellList[nMarkConnCell]->ConvertCell( + xXFCell = m_ConnCellList[nMarkConnCell]->DoConvertCell( pTable->GetObjectID(), crowid+m_ConnCellList[nMarkConnCell]->GetNumrows()-1, m_ConnCellList[nMarkConnCell]->GetColID()); @@ -401,7 +401,7 @@ void LwpRowLayout::ConvertCommonRow(rtl::Reference const & pXFTable, sa nCellEndCol = i+pConnCell->GetNumcols()-1; i = nCellEndCol; } - xCell = pCellLayout->ConvertCell(pTable->GetObjectID(),crowid,i); + xCell = pCellLayout->DoConvertCell(pTable->GetObjectID(),crowid,i); break; } rCellID = pCellLayout->GetNext(); @@ -414,7 +414,7 @@ void LwpRowLayout::ConvertCommonRow(rtl::Reference const & pXFTable, sa LwpCellLayout * pDefaultCell = pTableLayout->GetDefaultCellLayout(); if (pDefaultCell) { - xCell = pDefaultCell->ConvertCell( + xCell = pDefaultCell->DoConvertCell( pTable->GetObjectID(),crowid, i); } else diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index ff4b7f65a6f9..51d2a25ab641 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -1361,7 +1361,7 @@ void LwpTableLayout::ConvertDefaultRow(rtl::Reference const & pXFTable, rtl::Reference xCell; if (m_pDefaultCellLayout) { - xCell = m_pDefaultCellLayout->ConvertCell( + xCell = m_pDefaultCellLayout->DoConvertCell( GetTable()->GetObjectID(),nRowID,j+nStartCol); } else