AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5500 check for out of range deltaFormat

Browse Source 
X-SVN-Rev: 20653
This commit is contained in:
Eric Mader 2006-11-14 19:24:02 +00:00
parent 8f03002294
commit fc18b5c750
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4c/source/layout/DeviceTables.cpp
View File

@ -1,7 +1,7 @@
/*
* @(#)DeviceTables.cpp 1.5 00/03/15
*
* (C) Copyright IBM Corp. 1998 - 2005 - All Rights Reserved
* (C) Copyright IBM Corp. 1998 - 2006 - All Rights Reserved
*
*/
@ -16,13 +16,15 @@ const le_uint16 DeviceTable::fieldMasks[] = {0x0003, 0x000F, 0x00FF};
const le_uint16 DeviceTable::fieldSignBits[] = {0x0002, 0x0008, 0x0080};
const le_uint16 DeviceTable::fieldBits[] = { 2, 4, 8};
#define FORMAT_COUNT LE_ARRAY_SIZE(fieldBits)
le_int16 DeviceTable::getAdjustment(le_uint16 ppem) const
{
le_uint16 start = SWAPW(startSize);
le_uint16 format = SWAPW(deltaFormat) - 1;
le_int16 result = 0;
if (ppem >= start && ppem <= SWAPW(endSize)) {
if (ppem >= start && ppem <= SWAPW(endSize) && format < FORMAT_COUNT) {
le_uint16 sizeIndex = ppem - start;
le_uint16 bits = fieldBits[format];
le_uint16 count = 16 / bits;