From 69ffdeb52a26c1648e6356f70b11d16702f4da40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 2 Feb 2011 12:39:49 +0000
Subject: [PATCH] Resolves: rhbz#674328 freeserif crashes libicu

---
 icu.8320.freeserif.crash.patch | 14 ++++++++++++++
 icu.spec                       |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 icu.8320.freeserif.crash.patch

diff --git a/icu.8320.freeserif.crash.patch b/icu.8320.freeserif.crash.patch
new file mode 100644
index 0000000..ad6674c
--- /dev/null
+++ b/icu.8320.freeserif.crash.patch
@@ -0,0 +1,14 @@
+diff -ru icu.orig/source/layout/LookupProcessor.cpp icu/source/layout/LookupProcessor.cpp
+--- icu/source/layout/LookupProcessor.cpp	2011-02-02 12:29:54.369077099 +0000
++++ icu/source/layout/LookupProcessor.cpp	2011-02-02 12:31:54.215503036 +0000
+@@ -70,6 +70,10 @@
+ 
+         if (selectMask != 0) {
+             const LookupTable *lookupTable = lookupListTable->getLookupTable(lookup);
++
++            if (!lookupTable)
++                continue;
++
+             le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags);
+             
+             glyphIterator.reset(lookupFlags, selectMask);
diff --git a/icu.spec b/icu.spec
index 0d314ad..2cfb9d6 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:      icu
 Version:   4.4.2
-Release:   4%{?dist}
+Release:   5%{?dist}
 Summary:   International Components for Unicode
 Group:     Development/Tools
 License:   MIT and UCD and Public Domain
@@ -18,6 +18,7 @@ Patch4: icu.7972.buildfix.patch
 Patch5: icu.7932.doublecompare.patch
 Patch6: icu.8011.buildfix.patch
 Patch7: icu.8198.revert.icu5431.patch
+Patch8: icu.8320.freeserif.crash.patch
 
 %description
 Tools and utilities for developing with icu.
@@ -64,6 +65,7 @@ BuildArch: noarch
 %patch5 -p1 -b .icu7932.doublecompare.patch
 %patch6 -p1 -b .icu8011.buildfix.patch
 %patch7 -p2 -R -b .icu8198.revert.icu5431.patch
+%patch8 -p1 -b .icu8320.freeserif.crash.patch
 
 %build
 cd source
@@ -146,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc source/__docs/%{name}/html/*
 
 %changelog
+* Wed Feb 02 2011 Caolán McNamara <caolanm@redhat.com> - 4.4.2-5
+- Resolves: rhbz#674328 freeserif crashes libicu
+
 * Thu Jan 13 2011 Caolán McNamara <caolanm@redhat.com> - 4.4.2-4
 - Resolves: rhbz#669237 strip libicudata