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

[Caolán McNamara]

 vcl/source/gdi/CommonSalLayout.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 243977708ceaf877e520ef0bb393aa49040d65c9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 9 10:58:39 2016 +0000

    crashtesting: crash on reexport of fdo58980-3.odt to odt
    
    since...
    
    commit 3a543f1f57aed3beba8879ed46e1f92f657151cb
    Date:   Mon Oct 10 00:54:00 2016 +0200
    
        Validate Kashida positions in CommonSalLayout
    
        Currently checks only for ligatures, but that is a big improvement over
        al code that didn’t do any validation except on Windows.
    
    Change-Id: I0da70d274a2e532d1ce7e7817bddbeca03893763

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index e7ed549..c6de183 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -756,6 +756,9 @@ bool CommonSalLayout::IsKashidaPosValid(int nCharPos) const
             if (pIter->maGlyphId == 0)
                 break;
 
+            if (pIter == m_GlyphItems.begin())
+                continue;
+
             // Search backwards for previous glyph belonging to a different
             // character. We are looking backwards because we are dealing with
             // RTL glyphs, which will be in visual order.