[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/generic

[Caolán McNamara]

 vcl/generic/glyphs/gcach_layout.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6bbc6df677bfb85f7410a18e36eca4f62360f4a9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 2 09:30:44 2015 +0100

    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 at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index bf2eab2..1194e70 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