rpms/freetype/devel freetype-2.2.1-memcpy-fix.patch, NONE, 1.1 freetype.spec, 1.44, 1.45

[fedora-cvs-commits at redhat.com]

Author: besfahbo

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12841

Modified Files:
	freetype.spec 
Added Files:
	freetype-2.2.1-memcpy-fix.patch 
Log Message:
* Mon Sep 11 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-10
- Fix crasher https://bugs.freedesktop.org/show_bug.cgi?id=6841
- Add freetype-2.2.1-memcpy-fix.patch


freetype-2.2.1-memcpy-fix.patch:
 psobjs.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE freetype-2.2.1-memcpy-fix.patch ---
--- freetype-2.2.1/src/psaux/psobjs.c~	2006-04-26 16:38:17.000000000 +0200
+++ freetype-2.2.1/src/psaux/psobjs.c	2006-09-10 15:01:13.000000000 +0200
@@ -165,6 +165,11 @@
       return PSaux_Err_Invalid_Argument;
     }
 
+    if ( length < 0 ) {
+      FT_ERROR(( "ps_table_add: invalid length\n" ));
+      return PSaux_Err_Invalid_Argument;
+    }
+
     /* grow the base block if needed */
     if ( table->cursor + length > table->capacity )
     {


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- freetype.spec	7 Sep 2006 18:42:59 -0000	1.44
+++ freetype.spec	11 Sep 2006 18:32:02 -0000	1.45
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -25,6 +25,9 @@
 # Fix multilib conflicts
 Patch88:  freetype-multilib.patch
 
+# Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
+Patch89:  freetype-2.2.1-memcpy-fix.patch
+
 # Upstream patches
 Patch100: freetype-composite.patch
 Patch101: freetype-more-composite.patch
@@ -83,6 +86,7 @@
 %patch46  -p1 -b .enable-valid
 
 %patch88 -p1 -b .multilib
+%patch89 -p1 -b .memcpy
 
 %patch100 -p1 -b .composite
 %patch101 -p1 -b .more-composite
@@ -203,6 +207,10 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Mon Sep 11 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-10
+- Fix crasher https://bugs.freedesktop.org/show_bug.cgi?id=6841
+- Add freetype-2.2.1-memcpy-fix.patch
+
 * Thu Sep 07 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-9
 - Add BuildRequires: libX11-devel (#205355)