[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

 vcl/source/fontsubset/sft.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 96af996b06f980006414dedcecc96978f5a31779
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 7 16:20:54 2018 +0000

    return early on short stream
    
    Change-Id: Ia9cb4dec5358281322a2428c5f2153836a1ee1af
    Reviewed-on: https://gerrit.libreoffice.org/49374
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 5c7929b76615..7c35d3207e0d 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1521,6 +1521,8 @@ int OpenTTFontBuffer(const void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, T
 
 static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
 {
+    if (t->fsize < 4)
+        return SF_TTFORMAT;
     int i;
     sal_uInt32 length, tag;
     sal_uInt32 tdoffset = 0;        /* offset to TableDirectory in a TTC file. For TTF files is 0 */