rpms/freetype/devel freetype-2.3.4-ttf-overflow.patch, NONE, 1.1 freetype.spec, 1.54, 1.55

[Behdad Esfahbod (behdad)]

Author: behdad

Update of /cvs/pkgs/rpms/freetype/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2840

Modified Files:
	freetype.spec 
Added Files:
	freetype-2.3.4-ttf-overflow.patch 
Log Message:
+* Thu May 31 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.4-3
+- Add freetype-2.3.4-ttf-overflow.patch


freetype-2.3.4-ttf-overflow.patch:

--- NEW FILE freetype-2.3.4-ttf-overflow.patch ---
--- freetype-2.3.4/src/truetype/ttgload.c~	2007/04/09 08:40:11	1.177
+++ freetype-2.3.4/src/truetype/ttgload.c	2007/04/27 17:16:50	1.178
@@ -271,7 +271,11 @@
 
     n_points = 0;
     if ( n_contours > 0 )
+    {
       n_points = cont[-1] + 1;
+      if ( n_points < 0 )
+        goto Invalid_Outline;
+    }
 
     /* note that we will add four phantom points later */
     error = FT_GLYPHLOADER_CHECK_POINTS( gloader, n_points + 4, 0 );
@@ -682,7 +686,7 @@
     FT_GlyphLoader  gloader = loader->gloader;
     FT_Error        error   = TT_Err_Ok;
     FT_Outline*     outline;
-    FT_UInt         n_points;
+    FT_Int          n_points;
 
 
     outline  = &gloader->current.outline;
@@ -709,7 +713,7 @@
       /* Deltas apply to the unscaled data. */
       FT_Vector*  deltas;
       FT_Memory   memory = loader->face->memory;
-      FT_UInt     i;
+      FT_Int      i;
 
 
       error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face),


Index: freetype.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- freetype.spec	12 Apr 2007 17:19:23 -0000	1.54
+++ freetype.spec	31 May 2007 20:42:50 -0000	1.55
@@ -8,7 +8,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.3.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -31,6 +31,7 @@
 Patch89:  freetype-2.2.1-memcpy-fix.patch
 
 # Upstream patches
+Patch100: freetype-2.3.4-ttf-overflow.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -92,6 +93,8 @@
 %patch88 -p1 -b .multilib
 %patch89 -p1 -b .memcpy
 
+%patch100 -p1 -b .ttf-overflow
+
 %build
 
 %configure --disable-static
@@ -205,6 +208,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Thu May 31 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.4-3
+- Add freetype-2.3.4-ttf-overflow.patch
+
 * Thu Apr 12 2007 Behdad Esfahbod <besfahbo at redhat.com> 2.3.4-2
 - Add alpha to 64-bit archs (#236166)