Check the return value of ImageList_GetImageInfo before adjusting the

size.

Check the return value of ImageList_GetImageInfo before adjusting the
8d74ef10 · Huw Davies · Alexandre Julliard · ac2a662a · 8d74ef10
Commit 8d74ef10 authored Nov 13, 2002 by Huw Davies Committed by Alexandre Julliard Nov 13, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

comboex.c dlls/comctl32/comboex.c +1 -2

No files found.
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -400,8 +400,7 @@ static void COMBOEX_ReSize (COMBOEX_INFO *infoPtr)

    COMBOEX_GetComboFontSize (infoPtr, &mysize);
    cy = mysize.cy + CBE_EXTRA;
-    if (infoPtr->himl) {
-	ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
+    if (infoPtr->himl && ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo)) {
 	cy = max (iinfo.rcImage.bottom - iinfo.rcImage.top, cy);
 	TRACE("upgraded height due to image:  height=%d\n", cy);
    }