summaryrefslogtreecommitdiff
path: root/icu/icu4c.8320.freeserif.crash.patch
diff options
context:
space:
mode:
Diffstat (limited to 'icu/icu4c.8320.freeserif.crash.patch')
-rw-r--r--icu/icu4c.8320.freeserif.crash.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/icu/icu4c.8320.freeserif.crash.patch b/icu/icu4c.8320.freeserif.crash.patch
new file mode 100644
index 000000000000..32e851c36d36
--- /dev/null
+++ b/icu/icu4c.8320.freeserif.crash.patch
@@ -0,0 +1,62 @@
+--- misc/icu/source/layout/LookupProcessor.h 2011-02-03 09:20:27.657005678 +0000
++++ misc/build/icu/source/layout/LookupProcessor.h 2011-02-03 09:25:34.498396208 +0000
+@@ -65,6 +65,7 @@
+ const FeatureListTable *featureListTable;
+
+ FeatureMask *lookupSelectArray;
++ le_uint32 lookupSelectCount;
+
+ le_uint16 *lookupOrderArray;
+ le_uint32 lookupOrderCount;
+--- 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);
+@@ -111,6 +115,9 @@
+ for (le_uint16 lookup = 0; lookup < lookupCount; lookup += 1) {
+ le_uint16 lookupListIndex = SWAPW(featureTable->lookupListIndexArray[lookup]);
+
++ if (lookupListIndex >= lookupSelectCount)
++ continue;
++
+ lookupSelectArray[lookupListIndex] |= featureMask;
+ lookupOrderArray[store++] = lookupListIndex;
+ }
+@@ -122,7 +129,7 @@
+ Offset scriptListOffset, Offset featureListOffset, Offset lookupListOffset,
+ LETag scriptTag, LETag languageTag, const FeatureMap *featureMap, le_int32 featureMapCount, le_bool orderFeatures,
+ LEErrorCode& success)
+- : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL),
++ : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), lookupSelectCount(0),
+ lookupOrderArray(NULL), lookupOrderCount(0)
+ {
+ const ScriptListTable *scriptListTable = NULL;
+@@ -170,6 +177,8 @@
+ lookupSelectArray[i] = 0;
+ }
+
++ lookupSelectCount = lookupListCount;
++
+ 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);
+ }
+