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 44c27bfb62ee9e820b659132ad9f8799b67064cc
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Aug 21 14:01:03 2015 +0100
avoid hang in certain ww6 docs
(cherry picked from commit d0813b432f94d214a6961cb6a1eb11f65399e59b)
Change-Id: Ife15f6a6e4b31c6e226a154dd708290266e86a2e
Reviewed-on: https://gerrit.libreoffice.org/17927
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@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 8f8c00b..e922037 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3880,7 +3880,7 @@ void SwWW8ImplReader::ReadAttrs(WW8_CP& rTxtPos, WW8_CP&
rNext, long nTextEnd, b
{
maCurrAttrCP = rTxtPos;
rNext = ReadTextAttr(rTxtPos, nTextEnd, rbStartLine);
- if (rTxtPos == rNext && rTxtPos == WW8_CP_MAX)
+ if (rTxtPos == rNext && rTxtPos >= nTextEnd)
break;
}
while( rTxtPos >= rNext );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
