[HarfBuzz] harfbuzz: Branch 'pango' - 2 commits

[Simon Hausmann]

 src/harfbuzz-shaper.cpp |    2 ++
 1 files changed, 2 insertions(+)

New commits:
diff-tree 7765d5c52f4afbef40ef1afbe39fe4bf69a3877f (from parents)
Merge: 8bfbb5094edf5d29e3a50a94f9f61b7e1f15f163 a467630b2ae0163da0855d39acecd87d18c445a6
Author: Simon Hausmann <shausman at trolltech.com>
Date:   Tue Jul 31 16:37:25 2007 +0200

    Merge branch 'master' into pango

diff-tree a467630b2ae0163da0855d39acecd87d18c445a6 (from bd934100d788f70300ffb1934b4164abf1b6b2b7)
Author: Simon Hausmann <shausman at trolltech.com>
Date:   Tue Jul 31 16:33:13 2007 +0200

    Don't crash if HB_FreeFace is called with a null pointer.

diff --git a/src/harfbuzz-shaper.cpp b/src/harfbuzz-shaper.cpp
index 83e9af7..d289a77 100644
--- a/src/harfbuzz-shaper.cpp
+++ b/src/harfbuzz-shaper.cpp
@@ -841,6 +841,8 @@ HB_Face HB_NewFace(void *font, HB_GetFon
 
 void HB_FreeFace(HB_Face face)
 {
+    if (!face)
+        return;
     if (face->gpos)
         HB_Done_GPOS_Table(face->gpos);
     if (face->gsub)