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

[Caolán McNamara]

 vcl/source/outdev/text.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 955b1abb77fd2d653f7370d8a474816b4962539f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Oct 22 21:28:57 2016 +0100

    crashtesting: assert on converting ooo66538-1.ppt to pdf
    
    Change-Id: I6bdb31715a4cb9e895fc169679a7465a8f18fc37

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 1530ab2..0506280 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1236,7 +1236,7 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( OUString& rStr,
         bool bIsCJKIdeograph = false;
         for( ; pStr < pEnd; ++pStr )
         {
-            if (pStr + 1 < pEnd && rtl::isHighSurrogate( *pStr ) )
+            if (pStr + 1 < pEnd && rtl::isHighSurrogate(pStr[0]) && rtl::isLowSurrogate(pStr[1]))
             {
                 sal_uInt32 nCode = rtl::combineSurrogates( pStr[0] , pStr[1] );
                 if ( !bIsCJKIdeograph && nCode >= 0xE0100 && nCode < 0xE01F0 ) // Variation Selector Supplements