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/ftbase.h   |  5 +++--
 src/base/ftbitmap.c |  4 ++--
 src/base/ftrfork.c  |  2 ++
 src/base/fttype1.c  | 22 +++++++++++++++++++++-
 4 files changed, 28 insertions(+), 5 deletions(-)

(limited to 'src/base')

diff --git a/src/base/ftbase.h b/src/base/ftbase.h
index 6375613..516f4bb 100644
--- a/src/base/ftbase.h
+++ b/src/base/ftbase.h
@@ -49,7 +49,8 @@ FT_BEGIN_HEADER
                          FT_Face     *aface );
 
 
-#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+#if defined( FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK ) && \
+    ( !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON ) )
   /* Mac OS X/Darwin kernel often changes recommended method to access */
   /* the resource fork and older methods makes the kernel issue the    */
   /* warning of deprecated method.  To calm it down, the methods based */
@@ -57,7 +58,7 @@ FT_BEGIN_HEADER
   /* the case the resource is opened but found to lack a font in it.   */
   FT_LOCAL( FT_Bool )
   raccess_rule_by_darwin_vfs( FT_UInt  rule_index );
-#endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */
+#endif
 
 
 FT_END_HEADER
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index 5ef7ac7..15c9d65 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -417,8 +417,8 @@
 
         target->pitch = source->width + pad;
 
-        if ( target->pitch > 0                           &&
-             target->rows > FT_ULONG_MAX / target->pitch )
+        if ( target->pitch > 0                                     &&
+             (FT_ULong)target->rows > FT_ULONG_MAX / target->pitch )
           return FT_Err_Invalid_Argument;
 
         if ( target->rows * target->pitch > old_size             &&
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
diff --git a/src/base/fttype1.c b/src/base/fttype1.c
index 8f1e102..c30124f 100644
--- a/src/base/fttype1.c
+++ b/src/base/fttype1.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType utility file for PS names support (body).                   */
 /*                                                                         */
-/*  Copyright 2002, 2003, 2004 by                                          */
+/*  Copyright 2002-2004, 2011 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -90,5 +90,25 @@
     return error;
   }
 
+/* documentation is in t1tables.h */
+FT_EXPORT_DEF( FT_Long )
+FT_Get_PS_Font_Value( FT_Face       face,
+                      PS_Dict_Keys  key,
+                      FT_UInt       idx,
+                      void         *value,
+                      FT_Long       value_len )
+{
+  FT_Int             result  = 0;
+  FT_Service_PsInfo  service = NULL;
+
+  if ( face )
+  {
+    FT_FACE_FIND_SERVICE( face, service, POSTSCRIPT_INFO );
+      if ( service && service->ps_get_font_value )
+      result = service->ps_get_font_value( face, key, idx,
+                                           value, value_len );
+  }
+  return result;
+}
 
 /* END */
-- 
cgit v1.2.3