From a07258d581243e9e6bf481ae9c94a9415ca10ba4 Mon Sep 17 00:00:00 2001
From: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Date: Sun, 29 Oct 2000 18:04:45 +0000
Subject: [PATCH] COMBOEX_DrawItem: check return value of
 SendMessageA(...,CB_GETITEMDATA,...)

---
 dlls/comctl32/comboex.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 3852bdd695c..201646dd022 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -572,6 +572,11 @@ COMBOEX_DrawItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     item = (CBE_ITEMDATA *)SendMessageA (infoPtr->hwndCombo, CB_GETITEMDATA, 
 					 (WPARAM)dis->itemID, 0);
+    if (item == (CBE_ITEMDATA *)CB_ERR)
+    {
+        TRACE("invalid item for id %d \n",dis->itemID);
+        return 0;
+    }
     if (!TRACE_ON(message)) {
 	TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", 
 	      dis->CtlType, dis->CtlID);