comctl32/header: Check Null before accessing struct member.

ddf0049e · Paul Vriens · Alexandre Julliard · f21983cf · ddf0049e
Commit ddf0049e authored Jun 02, 2006 by Paul Vriens Committed by Alexandre Julliard Jun 02, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

header.c dlls/comctl32/header.c +3 -1

No files found.
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -1141,15 +1141,17 @@ HEADER_GetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode)
 {
    HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd);
    HEADER_ITEM *lpItem;
-    UINT mask = phdi->mask;
+    UINT mask;

    if (!phdi)
 	return FALSE;

    TRACE("[nItem=%d]\n", nItem);

+    mask = phdi->mask;
    if (mask == 0)
 	return TRUE;
+
    if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
        return FALSE;