- Fix a possible out of bounds read.
CID 731665

svn path=/trunk/; revision=62651
This commit is contained in:
Kamil Hornicek 2014-04-06 13:09:04 +00:00
parent ab07d0dfbe
commit d141ce54b6

View file

@ -533,19 +533,19 @@ IntTranslateCharsetInfo(PDWORD Src, /* [in]
switch (Flags) switch (Flags)
{ {
case TCI_SRCFONTSIG: case TCI_SRCFONTSIG:
while (0 == (*Src >> Index & 0x0001) && Index < MAXTCIINDEX) while (Index < MAXTCIINDEX && 0 == (*Src >> Index & 0x0001))
{ {
Index++; Index++;
} }
break; break;
case TCI_SRCCODEPAGE: case TCI_SRCCODEPAGE:
while ( *Src != FontTci[Index].ciACP && Index < MAXTCIINDEX) while (Index < MAXTCIINDEX && *Src != FontTci[Index].ciACP)
{ {
Index++; Index++;
} }
break; break;
case TCI_SRCCHARSET: case TCI_SRCCHARSET:
while ( *Src != FontTci[Index].ciCharset && Index < MAXTCIINDEX) while (Index < MAXTCIINDEX && *Src != FontTci[Index].ciCharset)
{ {
Index++; Index++;
} }