Return false if index is out of bounds in GetItemT.

def2bb67 · Vitaliy Margolen · Alexandre Julliard · 82f403bd · def2bb67
Commit def2bb67 authored Nov 17, 2005 by Vitaliy Margolen Committed by Alexandre Julliard Nov 17, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

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

No files found.
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -813,11 +813,10 @@ HEADER_GetItemT (HWND hwnd, INT nItem, LPHDITEMW phdi, BOOL bUnicode)

    if (phdi->mask == 0)
 	return TRUE;
-
    if ((nItem < 0) || (nItem >= (INT)infoPtr->uNumItem))
-        lpItem = NULL;
-    else
-        lpItem = &infoPtr->items[nItem];
+        return FALSE;
+
+    lpItem = &infoPtr->items[nItem];

    if (phdi->mask & HDI_BITMAP)
 	phdi->hbm = (lpItem != NULL) ? lpItem->hbm : 0;