sw/qa/core/data/ww8/pass/hang-3.doc |binary
sw/source/filter/ww8/ww8par.cxx | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 806eb2861e2417f9ab4121565f5f857bc86144ca
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 11 20:58:22 2015 +0100
avoid another hang with certain .docs
(cherry picked from commit 0592da19b625975886d3442477f4399660736a69)
Change-Id: If16e90c5ba1a43ceb9702e752835928da7b3ef32
Reviewed-on: https://gerrit.libreoffice.org/17657
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/sw/qa/core/data/ww8/pass/hang-3.doc
b/sw/qa/core/data/ww8/pass/hang-3.doc
new file mode 100644
index 0000000..4188b80
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/hang-3.doc differ
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e3e4aaa..0f8f8d5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2286,7 +2286,7 @@ void SwWW8ImplReader::Read_HdFtText(WW8_CP nStart, WW8_CP
nLen, SwFrameFormat* p
bool SwWW8ImplReader::isValid_HdFt_CP(WW8_CP nHeaderCP) const
{
// Each CP of Plcfhdd MUST be less than FibRgLw97.ccpHdd
- return (nHeaderCP < m_pWwFib->ccpHdr);
+ return (nHeaderCP < m_pWwFib->ccpHdr && nHeaderCP >= 0);
}
bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 nWhichItems, sal_uInt8
grpfIhdt,
@@ -2304,7 +2304,7 @@ bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8
nWhichItems, sal_uInt8 grpfIh
{
bool bOk = true;
if( m_bVer67 )
- bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, start, nLen ) &&
nLen >= 2 );
+ bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, start, nLen ) &&
start >= 0 && nLen >= 2 );
else
{
m_pHdFt->GetTextPosExact( static_cast< short >(nNumber +
(nSect+1)*6), start, nLen);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
