Bug 689087 - Relax cmap format 4 checking slightly to allow Baskerville on Lion to work; r=jdaggett

This commit is contained in:
Jonathan Kew 2011-11-17 19:11:37 +01:00
Родитель 09b5321d06
Коммит 64e4f1e6dd
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -361,8 +361,10 @@ gfxFontUtils::ReadCMAPTableFormat4(const PRUint8 *aBuf, PRUint32 aLength,
const PRUint16 idRangeOffset = ReadShortAt16(idRangeOffsets, i);
// sanity-check range
NS_ENSURE_TRUE((startCount > prevEndCount || i == 0 || startCount == 0xFFFF) &&
startCount <= endCount,
// This permits ranges to overlap by 1 character, which is strictly
// incorrect but occurs in Baskerville on OS X 10.7 (see bug 689087),
// and appears to be harmless in practice
NS_ENSURE_TRUE(startCount >= prevEndCount && startCount <= endCount,
NS_ERROR_GFX_CMAP_MALFORMED);
prevEndCount = endCount;