From ddf0049e9c51581a78ad5ae11c7dd4c47dd11d77 Mon Sep 17 00:00:00 2001
From: Paul Vriens <Paul.Vriens@xs4all.nl>
Date: Fri, 2 Jun 2006 10:38:22 +0200
Subject: [PATCH] comctl32/header: Check Null before accessing struct member.

---
 dlls/comctl32/header.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 493df6f4c70..41c4071ca81 100644
--- 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;
 
-- 
2.11.4.GIT