commit a07258d581243e9e6bf481ae9c94a9415ca10ba4
author Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> Sun Oct 29 18:04:45 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Oct 29 18:04:45 2000 +0000
tree b627dbb1558f808f0f1d10cc0ddd7e249e6fed92
parent d654f94f2144d0a219c473ed1b4c65a38d55704e

COMBOEX_DrawItem: check return value of SendMessageA(...,CB_GETITEMDATA,...)

dlls/comctl32/comboex.c

diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 3852bdd..201646d 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -572,6 +572,11 @@
 
     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);