From aa53a1920bfc7f928e91a9008a50ec186712326b Mon Sep 17 00:00:00 2001
From: besfahbo <besfahbo@fedoraproject.org>
Date: Mon, 11 Sep 2006 18:32:02 +0000
Subject: [PATCH] - 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 | 14 ++++++++++++++
 freetype.spec                   | 10 +++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 freetype-2.2.1-memcpy-fix.patch

diff --git a/freetype-2.2.1-memcpy-fix.patch b/freetype-2.2.1-memcpy-fix.patch
new file mode 100644
index 0000000..67a1c07
--- /dev/null
+++ b/freetype-2.2.1-memcpy-fix.patch
@@ -0,0 +1,14 @@
+--- 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 )
+     {
diff --git a/freetype.spec b/freetype.spec
index cd25645..568eebf 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -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 @@ Patch46:  freetype-2.2.1-enable-valid.patch
 # 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 @@ popd
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/
 
 %changelog
+* Mon Sep 11 2006 Behdad Esfahbod <besfahbo@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@redhat.com> 2.2.1-9
 - Add BuildRequires: libX11-devel (#205355)