diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-21 14:01:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-21 14:01:03 +0100 |
| commit | d0813b432f94d214a6961cb6a1eb11f65399e59b (patch) | |
| tree | 6ae46f697d88d387789ebd23644a54f7efbf5219 | |
| parent | e0ad897e40e57ab81fc0a18e8f907594f17b7430 (diff) | |
avoid hang in certain ww6 docs
Change-Id: Ife15f6a6e4b31c6e226a154dd708290266e86a2e
| -rw-r--r-- | sw/qa/core/data/ww6/pass/hang-1.doc | bin | 0 -> 6630 bytes | |||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/core/data/ww6/pass/hang-1.doc b/sw/qa/core/data/ww6/pass/hang-1.doc Binary files differnew file mode 100644 index 000000000000..825283d51e19 --- /dev/null +++ b/sw/qa/core/data/ww6/pass/hang-1.doc diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index ee603c2f57fb..dd12be46abf5 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3880,7 +3880,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 ); |