[coverity] fix dereferencing a potential NULL pointer.
Rein Klazes
wijn at wanadoo.nl
Sat Apr 8 05:48:13 CDT 2006
hi
Changelog:
dlls/user : menu.c
Fix dereferencing a potential NULL pointer.
Rein.
-------------- next part --------------
--- dlls/user/menu.1.c 2006-04-08 12:26:05.000000000 +0200
+++ dlls/user/menu.c 2006-04-08 12:37:53.000000000 +0200
@@ -1693,23 +1693,23 @@ static void MENU_DrawPopupMenu( HWND hwn
else
DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT);
- menu = MENU_GetMenu( hmenu );
-
- /* draw menu items */
- if (menu && menu->nItems)
- {
- MENUITEM *item;
- UINT u;
-
- for (u = menu->nItems, item = menu->items; u > 0; u--, item++)
- MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc, item,
- menu->Height, FALSE, ODA_DRAWENTIRE );
-
- }
+ if( (menu = MENU_GetMenu( hmenu )))
+ {
+ /* draw menu items */
+ if( menu->nItems)
+ {
+ MENUITEM *item;
+ UINT u;
- /* draw scroll arrows */
- if (menu->bScrolling)
- MENU_DrawScrollArrows(menu, hdc);
+ item = menu->items;
+ for( u = menu->nItems; u > 0; u--, item++)
+ MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc,
+ item, menu->Height, FALSE, ODA_DRAWENTIRE );
+ }
+ /* draw scroll arrows */
+ if (menu->bScrolling)
+ MENU_DrawScrollArrows(menu, hdc);
+ }
} else
{
SelectObject( hdc, hPrevBrush );
More information about the wine-patches
mailing list