[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx |   23 +++++++++++++----------
 sw/source/filter/ww8/ww8par.hxx |    4 ++--
 2 files changed, 15 insertions(+), 12 deletions(-)

New commits:
commit d510b85aa5e1c51f5bf4e08edf47725a7a75ce04
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 14 14:40:38 2015 +0100

    skip importing properties if the desired start pos is invalid
    
    Change-Id: Iae650d63ccdb95a0a74674b8689813069b750b60
    (cherry picked from commit b4a718583a3311dda7abd3010938c847b16e5f30)
    Reviewed-on: https://gerrit.libreoffice.org/17761
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0f8f8d5..f07ddff75 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3729,7 +3729,7 @@ void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes,
     }
 }
 
-long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, bool& rbStartLine)
+long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, long nTextEnd, bool& rbStartLine)
 {
     long nSkipChars = 0;
     WW8PLCFManResult aRes;
@@ -3794,7 +3794,9 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, bool& rbStartLine)
         }
     }
 
-    m_pStrm->Seek(m_pSBase->WW8Cp2Fc( m_pPlcxMan->GetCpOfs() + rTextPos, &m_bIsUnicode));
+    sal_Int32 nRequestedPos = m_pSBase->WW8Cp2Fc(m_pPlcxMan->GetCpOfs() + rTextPos, &m_bIsUnicode);
+    bool bValidPos = checkSeek(*m_pStrm, nRequestedPos);
+    SAL_WARN_IF(!bValidPos, "sw.ww8", "Document claimed to have text at an invalid position, skip attributes for region");
 
     // Find next Attr position (and Skip attributes of field contents if needed)
     if (nSkipChars && !m_bIgnoreText)
@@ -3808,7 +3810,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, bool& rbStartLine)
     {
         if( bDoPlcxManPlusPLus )
             m_pPlcxMan->advance();
-        nNext = m_pPlcxMan->Where();
+        nNext = bValidPos ? m_pPlcxMan->Where() : nTextEnd;
 
         if (m_pPostProcessAttrsInfo &&
             m_pPostProcessAttrsInfo->mnCpStart == nNext)
@@ -3818,7 +3820,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, bool& rbStartLine)
 
         if( (0 <= nNext) && (nSkipPos >= nNext) )
         {
-            nNext = ReadTextAttr( rTextPos, rbStartLine );
+            nNext = ReadTextAttr(rTextPos, nTextEnd, rbStartLine);
             bDoPlcxManPlusPLus = false;
             m_bIgnoreText = true;
         }
@@ -3869,7 +3871,7 @@ void SwWW8ImplReader::ClearParaEndPosition()
         m_aEndParaPos.clear();
 }
 
-void SwWW8ImplReader::ReadAttrs(WW8_CP& rNext, WW8_CP& rTextPos, bool& rbStartLine)
+void SwWW8ImplReader::ReadAttrs(WW8_CP& rTextPos, WW8_CP& rNext, long nTextEnd, bool& rbStartLine)
 {
     // Dow we have attributes?
     if( rTextPos >= rNext )
@@ -3877,7 +3879,7 @@ void SwWW8ImplReader::ReadAttrs(WW8_CP& rNext, WW8_CP& rTextPos, bool& rbStartLi
         do
         {
             m_aCurrAttrCP = rTextPos;
-            rNext = ReadTextAttr( rTextPos, rbStartLine );
+            rNext = ReadTextAttr(rTextPos, nTextEnd, rbStartLine);
             if (rTextPos == rNext && rTextPos == WW8_CP_MAX)
                 break;
         }
@@ -3953,18 +3955,19 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP nTextLen, ManTypes nType)
         SAL_WARN_IF(nTextLen > nMaxPossible, "sw.ww8", "TextLen too long");
         nTextLen = nMaxPossible;
     }
-    while ( l<nStartCp+nTextLen )
+    WW8_CP nTextEnd = nStartCp+nTextLen;
+    while (l < nTextEnd)
     {
-        ReadAttrs( nNext, l, bStartLine );// Takes SectionBreaks into account, too
+        ReadAttrs( l, nNext, nTextEnd, bStartLine );// Takes SectionBreaks into account, too
         OSL_ENSURE(m_pPaM->GetNode().GetTextNode(), "Missing txtnode");
 
         if (m_pPostProcessAttrsInfo != NULL)
             PostProcessAttrs();
 
-        if( l>= nStartCp + nTextLen )
+        if (l >= nTextEnd)
             break;
 
-        bStartLine = ReadChars(l, nNext, nStartCp+nTextLen, nCpOfs);
+        bStartLine = ReadChars(l, nNext, nTextEnd, nCpOfs);
 
         // If the previous paragraph was a dropcap then do not
         // create a new txtnode and join the two paragraphs together
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 9f9160c..8a130a1 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1420,8 +1420,8 @@ private:
 
     void ProcessAktCollChange(WW8PLCFManResult& rRes, bool* pStartAttr,
         bool bCallProcessSpecial);
-    long ReadTextAttr(WW8_CP& rTextPos, bool& rbStartLine);
-    void ReadAttrs(WW8_CP& rNext, WW8_CP& rTextPos, bool& rbStartLine);
+    long ReadTextAttr(WW8_CP& rTextPos, long nTextEnd, bool& rbStartLine);
+    void ReadAttrs(WW8_CP& rTextPos, WW8_CP& rNext, long nTextEnd, bool& rbStartLine);
     void CloseAttrEnds();
     bool ReadText(WW8_CP nStartCp, WW8_CP nTextLen, ManTypes nType);