gdi32: Prevent possible buffer overrun.

dd0a7078 · Nikolay Sivov · Alexandre Julliard · 975a93de · dd0a7078
Commit dd0a7078 authored Oct 19, 2009 by Nikolay Sivov Committed by Alexandre Julliard Oct 20, 2009
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

font.c dlls/gdi32/font.c +3 -3

No files found.
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2596,13 +2596,13 @@ BOOL WINAPI TranslateCharsetInfo(
    int index = 0;
    switch (flags) {
    case TCI_SRCFONTSIG:
-	while (!(*lpSrc>>index & 0x0001) && index<MAXTCIINDEX) index++;
+      while (index < MAXTCIINDEX && !(*lpSrc>>index & 0x0001)) index++;
      break;
    case TCI_SRCCODEPAGE:
-      while (PtrToUlong(lpSrc) != FONT_tci[index].ciACP && index < MAXTCIINDEX) index++;
+      while (index < MAXTCIINDEX && PtrToUlong(lpSrc) != FONT_tci[index].ciACP) index++;
      break;
    case TCI_SRCCHARSET:
-      while (PtrToUlong(lpSrc) != FONT_tci[index].ciCharset && index < MAXTCIINDEX) index++;
+      while (index < MAXTCIINDEX && PtrToUlong(lpSrc) != FONT_tci[index].ciCharset) index++;
      break;
    default:
      return FALSE;