Kaydet (Commit) 0592da19 authored tarafından Caolán McNamara's avatar Caolán McNamara

avoid another hang with certain .docs

Change-Id: If16e90c5ba1a43ceb9702e752835928da7b3ef32
üst 7b09e2a9
This diff was suppressed by a .gitattributes entry.
...@@ -2287,7 +2287,7 @@ void SwWW8ImplReader::Read_HdFtText(WW8_CP nStart, WW8_CP nLen, SwFrameFormat* p ...@@ -2287,7 +2287,7 @@ void SwWW8ImplReader::Read_HdFtText(WW8_CP nStart, WW8_CP nLen, SwFrameFormat* p
bool SwWW8ImplReader::isValid_HdFt_CP(WW8_CP nHeaderCP) const bool SwWW8ImplReader::isValid_HdFt_CP(WW8_CP nHeaderCP) const
{ {
// Each CP of Plcfhdd MUST be less than FibRgLw97.ccpHdd // 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, bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 nWhichItems, sal_uInt8 grpfIhdt,
...@@ -2304,7 +2304,7 @@ bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 nWhichItems, sal_uInt8 grpfIh ...@@ -2304,7 +2304,7 @@ bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 nWhichItems, sal_uInt8 grpfIh
{ {
bool bOk = true; bool bOk = true;
if( m_bVer67 ) if( m_bVer67 )
bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, nStart, nLen ) && nLen >= 2 ); bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, nStart, nLen ) && nStart >= 0 && nLen >= 2 );
else else
{ {
m_pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), nStart, nLen); m_pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), nStart, nLen);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment