gdi32: Avoid reading past the end of the indices array.

Spotted by Marcus Meissner.

gdi32: Avoid reading past the end of the indices array.
0ab46cd5 · Huw Davies · Alexandre Julliard · 224e51fc · 0ab46cd5 · 0ab46cd5
Commit 0ab46cd5 authored Nov 24, 2011 by Huw Davies Committed by Alexandre Julliard Nov 24, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

graphics.c dlls/gdi32/dibdrv/graphics.c +2 -1

font.c dlls/gdi32/font.c +2 -1

No files found.
--- a/dlls/gdi32/dibdrv/graphics.c
+++ b/dlls/gdi32/dibdrv/graphics.c
@@ -192,8 +192,9 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags, GLYPHMETRICS 

    indices[0] = index;

-    for (i = 0; i < sizeof(indices) / sizeof(indices[0]); index = indices[++i])
+    for (i = 0; i < sizeof(indices) / sizeof(indices[0]); i++)
    {
+        index = indices[i];
        ret = GetGlyphOutlineW( hdc, index, ggo_flags, metrics, 0, NULL, &identity );
        if (ret != GDI_ERROR) break;
    }

--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -1640,8 +1640,9 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT aa_flags,

    indices[0] = index;

-    for (i = 0; i < sizeof(indices) / sizeof(indices[0]); index = indices[++i])
+    for (i = 0; i < sizeof(indices) / sizeof(indices[0]); i++)
    {
+        index = indices[i];
        ret = GetGlyphOutlineW( hdc, index, ggo_flags, metrics, 0, NULL, &identity );
        if (ret != GDI_ERROR) break;
    }