From 0b6c1b1f57becd0c628c9f616c184f98989d8322 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Wed, 8 Nov 2006 09:18:58 +0000
Subject: [PATCH] add icu.icu5500.devicetablecrash.patch

---
 icu.icu5500.devicetablecrash.patch | 11 ++++++++
 icu.spec                           | 41 +++++++++++++++++-------------
 2 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 icu.icu5500.devicetablecrash.patch

diff --git a/icu.icu5500.devicetablecrash.patch b/icu.icu5500.devicetablecrash.patch
new file mode 100644
index 0000000..16ea5b7
--- /dev/null
+++ b/icu.icu5500.devicetablecrash.patch
@@ -0,0 +1,11 @@
+--- icu.orig/source/layout/DeviceTables.cpp	2006-10-18 09:05:20.000000000 +0100
++++ icu/source/layout/DeviceTables.cpp	2006-11-08 09:08:09.000000000 +0000
+@@ -22,7 +22,7 @@
+     le_uint16 format = SWAPW(deltaFormat) - 1;
+     le_int16 result = 0;
+     
+-    if (ppem >= start && ppem <= SWAPW(endSize)) {
++    if (ppem >= start && ppem <= SWAPW(endSize) && format < sizeof(fieldBits)/sizeof(fieldBits[0])) {
+         le_uint16 sizeIndex = ppem - start;
+         le_uint16 bits = fieldBits[format];
+         le_uint16 count = 16 / bits;
diff --git a/icu.spec b/icu.spec
index 6ea12cc..fb7fc3d 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
 Name:           icu
 Version:        3.6
-Release: 	9
+Release: 	10
 Summary:        International Components for Unicode
 
 Group:          System Environment/Libraries
@@ -10,15 +10,16 @@ Source0:        ftp://ftp.software.ibm.com/software/globalization/icu/icu4c-3_6-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  doxygen, autoconf
-Patch1: icu-3.4-multiarchdevel.patch
-Patch2: icu-config
-Patch3: icu.icu5365.dependantvowels.patch
-Patch4: icu.icu5418.malayam.patch
-Patch5: icu.icu5431.malayam.patch
-Patch6: icu.icu5433.oriya.patch
-Patch7: icu.icuXXXX.virama.prevnext.patch
-Patch8: icu.icu5465.telegu.patch
-Patch9: icu.icu5488.assamese.patch
+Patch1:  icu-3.4-multiarchdevel.patch
+Patch2:  icu-config
+Patch3:  icu.icu5365.dependantvowels.patch
+Patch4:  icu.icu5418.malayam.patch
+Patch5:  icu.icu5431.malayam.patch
+Patch6:  icu.icu5433.oriya.patch
+Patch7:  icu.icuXXXX.virama.prevnext.patch
+Patch8:  icu.icu5465.telegu.patch
+Patch9:  icu.icu5488.assamese.patch
+Patch10: icu.icu5500.devicetablecrash.patch
 
 %description
 The International Components for Unicode (ICU) libraries provide
@@ -58,14 +59,15 @@ Group:          Documentation
 
 %prep
 %setup -q -n %{name}
-%patch1 -p1 -b .multiarchdevel
-%patch3 -p1 -b .dependantvowels
-%patch4 -p1 -b .icu5418.malayam.patch
-%patch5 -p1 -b .icu5431.malayam.patch
-%patch6 -p1 -b .icu5433.oriya.patch
-%patch7 -p1 -b .icuXXXX.virama.prevnext.patch
-%patch8 -p1 -b .icu5465.telegu.patch
-%patch9 -p1 -b .icu5488.assamese.patch
+%patch1  -p1 -b .multiarchdevel
+%patch3  -p1 -b .dependantvowels
+%patch4  -p1 -b .icu5418.malayam.patch
+%patch5  -p1 -b .icu5431.malayam.patch
+%patch6  -p1 -b .icu5433.oriya.patch
+%patch7  -p1 -b .icuXXXX.virama.prevnext.patch
+%patch8  -p1 -b .icu5465.telegu.patch
+%patch9  -p1 -b .icu5488.assamese.patch
+%patch10 -p1 -b .icu5500.devicetablecrash.patch
 
 %build
 cd source
@@ -146,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 08 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-10
+- Resolves: rhbz#214555 icu.icu5500.devicetablecrash.patch
+
 * Thu Oct 18 2006 Caolan McNamara <caolanm@redhat.com> - 3.6-9
 - Resolves: rhbz#213648 extend prev/next to handle ZWJ