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

a07258d5 · Uwe Bonnes · Alexandre Julliard · d654f94f · a07258d5
Commit a07258d5 authored Oct 29, 2000 by Uwe Bonnes Committed by Alexandre Julliard Oct 29, 2000
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

comboex.c dlls/comctl32/comboex.c +5 -0

No files found.
--- 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);