[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit a3073d346be17da7b35e2511871511af710add24
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 14 21:25:59 2018 +0000

    ofz#5299 Timeout
    
    Change-Id: I9c7968d44fc608431615b6fe0b1013e8a677bf60
    Reviewed-on: https://gerrit.libreoffice.org/47871
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 0ab07dfcadce..526ea5c1eea5 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3415,6 +3415,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                 if (bFail)
                 {
                     SAL_WARN("sw.ww8", "broken offset, ignoring");
+                    p->nStartPos = p->nEndPos = WW8_FC_MAX;
                     pPieceIter->SetIdx(nOldPos);
                     return;
                 }
@@ -3425,6 +3426,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                     if (bFail)
                     {
                         SAL_WARN("sw.ww8", "broken offset, ignoring");
+                        p->nStartPos = p->nEndPos = WW8_FC_MAX;
                         pPieceIter->SetIdx(nOldPos);
                         return;
                     }
@@ -3434,6 +3436,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                 if (bFail)
                 {
                     SAL_WARN("sw.ww8", "broken offset, ignoring");
+                    p->nStartPos = p->nEndPos = WW8_FC_MAX;
                     pPieceIter->SetIdx(nOldPos);
                     return;
                 }
@@ -3444,6 +3447,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                     if (bFail)
                     {
                         SAL_WARN("sw.ww8", "broken offset, ignoring");
+                        p->nStartPos = p->nEndPos = WW8_FC_MAX;
                         pPieceIter->SetIdx(nOldPos);
                         return;
                     }
@@ -3454,6 +3458,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                     if (bFail)
                     {
                         SAL_WARN("sw.ww8", "broken offset, ignoring");
+                        p->nStartPos = p->nEndPos = WW8_FC_MAX;
                         pPieceIter->SetIdx(nOldPos);
                         return;
                     }
@@ -3506,6 +3511,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                             if (bFail)
                             {
                                 SAL_WARN("sw.ww8", "broken offset, ignoring");
+                                p->nStartPos = p->nEndPos = WW8_FC_MAX;
                                 continue;
                             }
 
@@ -3515,6 +3521,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                                 if (bFail)
                                 {
                                     SAL_WARN("sw.ww8", "broken offset, ignoring");
+                                    p->nStartPos = p->nEndPos = WW8_FC_MAX;
                                     continue;
                                 }
                             }
@@ -3523,6 +3530,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                             if (bFail)
                             {
                                 SAL_WARN("sw.ww8", "broken offset, ignoring");
+                                p->nStartPos = p->nEndPos = WW8_FC_MAX;
                                 continue;
                             }
 
@@ -3541,6 +3549,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                                 if (bFail)
                                 {
                                     SAL_WARN("sw.ww8", "broken offset, ignoring");
+                                    p->nStartPos = p->nEndPos = WW8_FC_MAX;
                                     continue;
                                 }
                                 if (bIsUnicode)
@@ -3551,6 +3560,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p)
                                 if (bFail)
                                 {
                                     SAL_WARN("sw.ww8", "broken offset, ignoring");
+                                    p->nStartPos = p->nEndPos = WW8_FC_MAX;
                                     continue;
                                 }