Pass the buck; make fontconfig not crash on pango badness.

diff --git a/ChangeLog b/ChangeLog
index 1f71f0675766a68bf02068ae680e632e8a560b95..78aa4aef96afd79abc14c32ffcdb5d39c2cd4853 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-21  Diego Petten  <flameeyes@gentoo.org>
+       * src/fcfreetype.c (FcFreeTypeCharIndex):
+
+       Pass the buck; make fontconfig not crash on pango badness.
+
 2006-02-21  Patrick Lam  <plam@mit.edu>
        * conf.d/10-fonts-persian.conf:
 

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index de20fd78163d6e365ba088dcb24a2d9b5262b2e7..e3c5ef23168c1dae2e68c460e527a1d920d9c06a 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -2312,6 +2312,10 @@ FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4)
     int                    p;
 
     initial = 0;
+
+    if (!face)
+        return 0;
+
     /*
      * Find the current encoding
      */