diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-02 09:30:44 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2015-04-02 09:21:25 +0000 |
| commit | 6bbc6df677bfb85f7410a18e36eca4f62360f4a9 (patch) | |
| tree | cda04d48518271db40ae3ec3ba5a8f136c91626e | |
| parent | Resolves: tdf#42481 propagate errors as errors in matrix calculations (diff) | |
| download | core-6bbc6df677bfb85f7410a18e36eca4f62360f4a9.tar.gz core-6bbc6df677bfb85f7410a18e36eca4f62360f4a9.zip | |
fix hang with ooo71962-1.odt
script run ends after chunk we are rendering
(cherry picked from commit 00bf3a4259c1f960eff05b17649cc734c275950f)
Change-Id: Idbfe11c385db72a80d3d204f8638d67395580d1b
Reviewed-on: https://gerrit.libreoffice.org/15116
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index bf2eab2c4bbb..1194e70eb13c 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -399,7 +399,9 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs) aScriptSubRuns.push_back(aRun); nCurrentPos = nEndRunPos; - aScriptRun.next(); + bool bHasMore = aScriptRun.next(); + if (!bHasMore) + break; } // RTL subruns should be reversed to ensure that final glyph order is |