[poppler] 2 commits - splash/SplashFTFont.cc

[Albert Astals Cid]

 splash/SplashFTFont.cc |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 042d332c1c9f628e3bfaabf3da9e04436a8677b5
Merge: 7b9a9f8... e044814...
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Oct 4 00:53:01 2012 +0200

    Merge remote-tracking branch 'origin/poppler-0.20'

commit e044814c0657a6c5b44939a01dcbdc8d83396d43
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
Date:   Thu Oct 4 00:51:04 2012 +0200

    Do not render invalid outlines
    
    Bug #55573

diff --git a/splash/SplashFTFont.cc b/splash/SplashFTFont.cc
index f18b58b..e57425e 100644
--- a/splash/SplashFTFont.cc
+++ b/splash/SplashFTFont.cc
@@ -16,6 +16,7 @@
 // Copyright (C) 2009 Petr Gajdos <pgajdos at novell.com>
 // Copyright (C) 2010 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
 // Copyright (C) 2011 Andreas Hartmetz <ahartmetz at gmail.com>
+// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -428,6 +429,9 @@ SplashPath *SplashFTFont::getGlyphPath(int c) {
   if (FT_Get_Glyph(slot, &glyph)) {
     return NULL;
   }
+  if (FT_Outline_Check(&((FT_OutlineGlyph)glyph)->outline)) {
+    return NULL;
+  }
   path.path = new SplashPath();
   path.textScale = textScale;
   path.needClose = gFalse;