Resolves: rhbz#674328 yet more ways that freeserif crashes libicu

This commit is contained in:
Caolán McNamara 2011-02-11 09:13:27 +00:00
parent 6c883575a1
commit 492b56eed1
2 changed files with 17 additions and 3 deletions

View File

@ -2,10 +2,10 @@
+++ icu/source/layout/LookupProcessor.h 2011-02-03 09:25:34.498396208 +0000
@@ -58,6 +58,7 @@
const FeatureListTable *featureListTable;
FeatureMask *lookupSelectArray;
+ le_uint32 lookupSelectCount;
le_uint16 *lookupOrderArray;
le_uint32 lookupOrderCount;
--- icu/source/layout/LookupProcessor.cpp 2011-02-02 12:29:54.369077099 +0000
@ -49,3 +49,14 @@
le_int32 count, order = 0;
le_int32 featureReferences = 0;
const FeatureTable *featureTable = NULL;
@@ -186,6 +195,10 @@
le_uint16 featureIndex = SWAPW(langSysTable->featureIndexArray[feature]);
featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag);
+
+ if (!featureTable)
+ continue;
+
featureReferences += SWAPW(featureTable->lookupCount);
}

View File

@ -1,6 +1,6 @@
Name: icu
Version: 4.4.2
Release: 6%{?dist}
Release: 7%{?dist}
Summary: International Components for Unicode
Group: Development/Tools
License: MIT and UCD and Public Domain
@ -148,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
%doc source/__docs/%{name}/html/*
%changelog
* Fri Feb 11 2011 Caolán McNamara <caolanm@redhat.com> - 4.4.2-7
- Resolves: rhbz#674328 yet more ways that freeserif crashes libicu
* Thu Feb 03 2011 Caolán McNamara <caolanm@redhat.com> - 4.4.2-6
- Resolves: rhbz#674328 more ways that freeserif crashes libicu