From 27811904d8de0ce5591417812ca31163bf5aad60 Mon Sep 17 00:00:00 2001
From: Geremy Condra <gcondra@google.com>
Date: Fri, 16 Dec 2011 12:43:20 -0800
Subject: Updated freetype to 2.4.8

This change is to fix a vulnerability in 2.4.7 (CVE-2011-3439). It
is taken from http://b/issue?id=5700584.

Change-Id: I25a87999bc3ab44d7c7f59e7f04f56895d86bb5d
---
 src/base/ftrfork.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/base/ftrfork.c')

diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c
index 4e7d510..33768b0 100644
--- a/src/base/ftrfork.c
+++ b/src/base/ftrfork.c
@@ -417,6 +417,7 @@
   }
 
 
+#if !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON )
   static FT_RFork_Rule
   raccess_get_rule_type_from_rule_index( FT_UInt  rule_index )
   {
@@ -440,6 +441,7 @@
         return FALSE;
     }
   }
+#endif
 
 
   static FT_Error
-- 
cgit v1.2.3