lotuswordpro/qa/cppunit/data/fail/loop-2.lwp |binary lotuswordpro/source/filter/lwpdivinfo.cxx | 8 +---- lotuswordpro/source/filter/lwpfont.cxx | 2 - lotuswordpro/source/filter/lwptablelayout.cxx | 4 +- lotuswordpro/source/filter/lwptblformula.cxx | 2 - lotuswordpro/source/filter/xfilter/xfcontent.hxx | 21 ++++++++++++-- lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx | 2 - lotuswordpro/source/filter/xfilter/xftextspan.cxx | 6 ++-- 8 files changed, 28 insertions(+), 17 deletions(-)
New commits: commit e1cb3aa56b94fdf75b775e42fe4b039be82b8d32 Author: Caolán McNamara <[email protected]> Date: Tue Mar 8 12:09:55 2016 +0000 avoid infinite regress in busted documents Change-Id: I639617e41cd9a9a51a3dd3efa32ac1cf2991b9d2 (cherry picked from commit f16ceae46dd8f3974a379c6fb07feaffb8012b25) Reviewed-on: https://gerrit.libreoffice.org/23030 Tested-by: Jenkins <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/lotuswordpro/qa/cppunit/data/fail/loop-2.lwp b/lotuswordpro/qa/cppunit/data/fail/loop-2.lwp new file mode 100644 index 0000000..6342cc5 Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/loop-2.lwp differ diff --git a/lotuswordpro/source/filter/lwpdivinfo.cxx b/lotuswordpro/source/filter/lwpdivinfo.cxx index 2f9a6cf..efa32f6 100644 --- a/lotuswordpro/source/filter/lwpdivinfo.cxx +++ b/lotuswordpro/source/filter/lwpdivinfo.cxx @@ -108,15 +108,11 @@ void LwpDivInfo::Read() m_FillerPageTextID.ReadIndexed(m_pObjStrm); // read external file object stuff -#if !defined(NDEBUG) - sal_uInt16 type = -#endif - m_pObjStrm->QuickReaduInt16(); + sal_uInt16 type = m_pObjStrm->QuickReaduInt16(); //cpExternalFile = LNULL; - assert(type==0); + SAL_WARN_IF(type != 0, "lwp", "should be 0"); m_pObjStrm->SkipExtra(); - } void LwpDivInfo::SkipFront() diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx index 5e0d274..8805533 100644 --- a/lotuswordpro/source/filter/lwpfont.cxx +++ b/lotuswordpro/source/filter/lwpfont.cxx @@ -262,7 +262,7 @@ void LwpFontTable::Read(LwpObjectStream *pStrm) OUString LwpFontTable::GetFaceName(sal_uInt16 index) //index: start from 1 { - assert(index <= m_nCount && index > 0); + SAL_WARN_IF(index > m_nCount || index <= 0, "lwp", "bad font index"); return (index <= m_nCount && index > 0) ? m_pFontEntries[index-1].GetFaceName() : OUString(); } diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 4efa6a8..3357ac1 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -215,13 +215,13 @@ double LwpSuperTableLayout::GetTableWidth() LwpTableLayout* pTableLayout = GetTableLayout(); if(!pTableLayout) { - assert(false); + SAL_WARN("lwp", "missing table layout, early return"); return 0; } LwpTable *pTable = pTableLayout->GetTable(); if(!pTable) { - assert(false); + SAL_WARN("lwp", "missing table, early return"); return 0; } double dDefaultWidth = pTable->GetWidth(); diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index 6f699c5..7a28a6e 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -342,7 +342,7 @@ void LwpFormulaInfo::Read() } else { - assert(false); + SAL_WARN("lwp", "missing row list"); } } m_pObjStrm->SeekRel(2);//flags, size in file: sal_uInt16 diff --git a/lotuswordpro/source/filter/xfilter/xfcontent.hxx b/lotuswordpro/source/filter/xfilter/xfcontent.hxx index 2d1dfa7..29a2fd0 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontent.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcontent.hxx @@ -64,6 +64,7 @@ #include <rtl/ustring.hxx> #include <salhelper/simplereferenceobject.hxx> +#include <stdexcept> #include "xfdefs.hxx" @@ -92,14 +93,28 @@ public: */ OUString GetStyleName() {return m_strStyleName;} - virtual void ToXml(IXFStream * stream) = 0; + void DoToXml(IXFStream* stream) + { + if (m_bDoingToXml) + throw std::runtime_error("recursion in content"); + m_bDoingToXml = true; + ToXml(stream); + m_bDoingToXml = false; + } protected: - XFContent() {} + XFContent() + : m_bDoingToXml(false) + { + } + + virtual void ToXml(IXFStream* stream) = 0; virtual ~XFContent() {} - OUString m_strStyleName; + OUString m_strStyleName; +private: + bool m_bDoingToXml; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx index 05a24f9..7608da2 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx @@ -131,7 +131,7 @@ void XFContentContainer::ToXml(IXFStream *pStrm) { XFContent *pContent = it->get(); if( pContent ) - pContent->ToXml(pStrm); + pContent->DoToXml(pStrm); } } diff --git a/lotuswordpro/source/filter/xfilter/xftextspan.cxx b/lotuswordpro/source/filter/xfilter/xftextspan.cxx index 4de6bad..90f6e32 100644 --- a/lotuswordpro/source/filter/xfilter/xftextspan.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextspan.cxx @@ -112,7 +112,7 @@ void XFTextSpan::ToXml(IXFStream *pStrm) { XFContent *pContent = it->get(); if( pContent ) - pContent->ToXml(pStrm); + pContent->DoToXml(pStrm); } pStrm->EndElement( "text:span" ); @@ -135,7 +135,7 @@ void XFTextSpanStart::ToXml(IXFStream *pStrm) { XFContent *pContent = it->get(); if( pContent ) - pContent->ToXml(pStrm); + pContent->DoToXml(pStrm); } } void XFTextSpanEnd::ToXml(IXFStream *pStrm) @@ -145,7 +145,7 @@ void XFTextSpanEnd::ToXml(IXFStream *pStrm) { XFContent *pContent = it->get(); if( pContent ) - pContent->ToXml(pStrm); + pContent->DoToXml(pStrm); } pStrm->EndElement( "text:span" ); }
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
