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

[Caolán McNamara]

 sw/qa/core/data/ww6/pass/hang-1.doc |binary
 sw/source/filter/ww8/ww8par.cxx     |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc45a7debed78ca417c79d69cc0b8f35d62f7940
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 21 14:01:03 2015 +0100

    avoid hang in certain ww6 docs
    
    Change-Id: Ife15f6a6e4b31c6e226a154dd708290266e86a2e
    (cherry picked from commit d0813b432f94d214a6961cb6a1eb11f65399e59b)
    Reviewed-on: https://gerrit.libreoffice.org/17911
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/qa/core/data/ww6/pass/hang-1.doc b/sw/qa/core/data/ww6/pass/hang-1.doc
new file mode 100644
index 0000000..825283d
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/hang-1.doc differ
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 6b288f7..1a33e2b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3881,7 +3881,7 @@ void SwWW8ImplReader::ReadAttrs(WW8_CP& rTextPos, WW8_CP& rNext, long nTextEnd,
         {
             m_aCurrAttrCP = rTextPos;
             rNext = ReadTextAttr(rTextPos, nTextEnd, rbStartLine);
-            if (rTextPos == rNext && rTextPos == WW8_CP_MAX)
+            if (rTextPos == rNext && rTextPos >= nTextEnd)
                 break;
         }
         while( rTextPos >= rNext );