[Libreoffice-commits] core.git: vcl/generic

[Caolán McNamara]

 vcl/generic/glyphs/gcach_layout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

    fix crash with ooo71962-1.odt
    
    script run ends after chunk we are rendering
    
    Change-Id: Idbfe11c385db72a80d3d204f8638d67395580d1b

diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 94486a1..e42008e 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -439,7 +439,7 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
             }
         }
 
-        while (nCurrentPos < nBidiEndRunPos)
+        while (nCurrentPos < nBidiEndRunPos && k < pTextLayout->runs.size())
         {
             int32_t nMinRunPos = nCurrentPos;
             int32_t nEndRunPos = std::min(pTextLayout->runs[k].nEnd, nBidiEndRunPos);