user32: Use FIELD_OFFSET to calculate the size of a struct with variable length array.

8ab1fc5f · Michael Stefaniuc · Alexandre Julliard · 7d4605db · 8ab1fc5f
Commit 8ab1fc5f authored Oct 24, 2012 by Michael Stefaniuc Committed by Alexandre Julliard Oct 24, 2012
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cursoricon.c dlls/user32/cursoricon.c +1 -1

No files found.
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -1330,7 +1330,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename,
    }

    dir = (const CURSORICONFILEDIR*) bits;
-    if ( filesize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) )
+    if ( filesize < FIELD_OFFSET( CURSORICONFILEDIR, idEntries[dir->idCount] ))
        goto end;

    if ( fCursor )