[Libreoffice-commits] .: icu/icu4c.8320.freeserif.crash.patch icu/makefile.mk

[Caolán McNamara]

 icu/icu4c.8320.freeserif.crash.patch |   13 +++++++++++++
 icu/makefile.mk                      |    4 ++++
 2 files changed, 17 insertions(+)

New commits:
commit fe9420244249f8a3c1f6bd54e19de3f317b90c21
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 2 12:48:07 2011 +0000

    Resolves: rhbz#674328 freeserif crashes libicu

diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch
new file mode 100644
index 0000000..4e4c3da
--- /dev/null
+++ b/icu/icu4c.8320.freeserif.crash.patch
@@ -0,0 +1,13 @@
+--- misc/icu/source/layout/LookupProcessor.cpp	2011-02-02 12:29:54.369077099 +0000
++++ misc/build/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/makefile.mk b/icu/makefile.mk
index 01610dc..dfe7252 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -46,8 +46,12 @@ TARFILE_MD5=
 .ENDIF
 TARFILE_ROOTDIR=icu
 
+#icu4c.8320.freeserif.crash.patch, see
+#http://bugs.icu-project.org/trac/ticket/8320 for crash with FreeSerif
+
 PATCH_FILES=\
     ${TARFILE_NAME}.patch \
+    icu4c.8320.freeserif.crash.patch \
     icu4c-aix.patch
 
 .IF "$(GUI)"=="UNX"