ICU-6.2.8.tar.gz

[apple/icu.git] / icuSources / layout / PairPositioningSubtables.cpp

diff --git a/icuSources/layout/PairPositioningSubtables.cpp b/icuSources/layout/PairPositioningSubtables.cpp
index 1aa8a7728fb2c1787d36bbca33a1b431e6cc48ea..7b31ac8618c401c149bd7899e607cfe4c82f7d20 100644 (file)
--- a/icuSources/layout/PairPositioningSubtables.cpp
+++ b/icuSources/layout/PairPositioningSubtables.cpp
@@ -1,7 +1,6 @@
 /*
 /*

- * @(#)PairPositioningSubtables.cpp    1.7 00/03/15

  *
  *

- * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -53,12 +52,16 @@ le_uint32 PairPositioningFormat1Subtable::process(GlyphIterator *glyphIterator,
     if (coverageIndex >= 0 && glyphIterator->next()) {
         Offset pairSetTableOffset = SWAPW(pairSetTableOffsetArray[coverageIndex]);
         PairSetTable *pairSetTable = (PairSetTable *) ((char *) this + pairSetTableOffset);
     if (coverageIndex >= 0 && glyphIterator->next()) {
         Offset pairSetTableOffset = SWAPW(pairSetTableOffsetArray[coverageIndex]);
         PairSetTable *pairSetTable = (PairSetTable *) ((char *) this + pairSetTableOffset);

+        le_uint16 pairValueCount = SWAPW(pairSetTable->pairValueCount);

         le_int16 valueRecord1Size = ValueRecord::getSize(SWAPW(valueFormat1));
         le_int16 valueRecord2Size = ValueRecord::getSize(SWAPW(valueFormat2));
         le_int16 recordSize = sizeof(PairValueRecord) - sizeof(ValueRecord) + valueRecord1Size + valueRecord2Size;
         LEGlyphID secondGlyph = glyphIterator->getCurrGlyphID();
         le_int16 valueRecord1Size = ValueRecord::getSize(SWAPW(valueFormat1));
         le_int16 valueRecord2Size = ValueRecord::getSize(SWAPW(valueFormat2));
         le_int16 recordSize = sizeof(PairValueRecord) - sizeof(ValueRecord) + valueRecord1Size + valueRecord2Size;
         LEGlyphID secondGlyph = glyphIterator->getCurrGlyphID();

-        const PairValueRecord *pairValueRecord =
-            findPairValueRecord((TTGlyphID) LE_GET_GLYPH(secondGlyph), pairSetTable->pairValueRecordArray, SWAPW(pairSetTable->pairValueCount), recordSize);
+        const PairValueRecord *pairValueRecord = NULL;
+
+        if (pairValueCount != 0) {
+            pairValueRecord = findPairValueRecord((TTGlyphID) LE_GET_GLYPH(secondGlyph), pairSetTable->pairValueRecordArray, pairValueCount, recordSize);
+        }

 
         if (pairValueRecord == NULL) {
             return 0;
 
         if (pairValueRecord == NULL) {
             return 0;