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

[Libreoffice Gerrit user]

 sw/qa/core/data/ww5/pass/hang-3.doc |binary
 sw/source/filter/ww8/ww8par2.cxx    |    5 +++++
 2 files changed, 5 insertions(+)

New commits:
commit c164084d02bbf03b0705947cd1ce35c7c02702b9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 4 10:46:02 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Feb 4 13:32:57 2019 +0100

    ofz#12856 infinite loop
    
    Change-Id: I84f54ba550225a8c250743db8b66e9cad0325714
    Reviewed-on: https://gerrit.libreoffice.org/67352
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/core/data/ww5/pass/hang-3.doc b/sw/qa/core/data/ww5/pass/hang-3.doc
new file mode 100644
index 000000000000..14fbaa60637d
Binary files /dev/null and b/sw/qa/core/data/ww5/pass/hang-3.doc differ
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index f5224bec80a1..5778a4c53414 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2082,6 +2082,11 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
                 break;
         }
 
+        if (nStartCp == aRes.nEndPos)
+        {
+            SAL_WARN("sw.ww8", "WW8TabDesc End same as Start, abandoning to avoid looping");
+            break;
+        }
         nStartCp = aRes.nEndPos;
     }
     while(true);