icu/icu4c.8320.freeserif.crash.patch

   1 --- misc/icu/source/layout/LookupProcessor.h    2011-02-03 09:20:27.657005678 +0000
   2 +++ misc/build/icu/source/layout/LookupProcessor.h      2011-02-03 09:25:34.498396208 +0000
   3 @@ -65,6 +65,7 @@
   4      const FeatureListTable  *featureListTable;
   5
   6      FeatureMask            *lookupSelectArray;
   7 +    le_uint32              lookupSelectCount;
   8
   9      le_uint16               *lookupOrderArray;
  10      le_uint32               lookupOrderCount;
  11 --- misc/icu/source/layout/LookupProcessor.cpp  2011-02-02 12:29:54.369077099 +0000
  12 +++ misc/build/icu/source/layout/LookupProcessor.cpp    2011-02-02 12:31:54.215503036 +0000
  13 @@ -70,6 +70,10 @@
  14
  15          if (selectMask != 0) {
  16              const LookupTable *lookupTable = lookupListTable->getLookupTable(lookup);
  17 +
  18 +            if (!lookupTable)
  19 +                continue;
  20 +
  21              le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags);
  22
  23              glyphIterator.reset(lookupFlags, selectMask);
  24 @@ -111,6 +115,9 @@
  25      for (le_uint16 lookup = 0; lookup < lookupCount; lookup += 1) {
  26          le_uint16 lookupListIndex = SWAPW(featureTable->lookupListIndexArray[lookup]);
  27
  28 +       if (lookupListIndex >= lookupSelectCount)
  29 +           continue;
  30 +
  31          lookupSelectArray[lookupListIndex] |= featureMask;
  32          lookupOrderArray[store++] = lookupListIndex;
  33      }
  34 @@ -122,7 +129,7 @@
  35          Offset scriptListOffset, Offset featureListOffset, Offset lookupListOffset,
  36          LETag scriptTag, LETag languageTag, const FeatureMap *featureMap, le_int32 featureMapCount, le_bool orderFeatures,
  37          LEErrorCode& success)
  38 -    : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL),
  39 +    : lookupListTable(NULL), featureListTable(NULL), lookupSelectArray(NULL), lookupSelectCount(0),
  40        lookupOrderArray(NULL), lookupOrderCount(0)
  41  {
  42      const ScriptListTable *scriptListTable = NULL;
  43 @@ -170,6 +177,8 @@
  44          lookupSelectArray[i] = 0;
  45      }
  46
  47 +    lookupSelectCount = lookupListCount;
  48 +
  49      le_int32 count, order = 0;
  50      le_int32 featureReferences = 0;
  51      const FeatureTable *featureTable = NULL;
  52 @@ -186,6 +195,10 @@
  53          le_uint16 featureIndex = SWAPW(langSysTable->featureIndexArray[feature]);
  54
  55          featureTable = featureListTable->getFeatureTable(featureIndex, &featureTag);
  56 +
  57 +        if (!featureTable)
  58 +             continue;
  59 +
  60          featureReferences += SWAPW(featureTable->lookupCount);
  61      }
  62