From 70a7f34dfc4d7ea4f7425b9a7359a08a35752bb0 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 11 May 2011 22:41:56 -0700 Subject: Add extra sanity checking to avoid possible NULL dereferences menus.c:569:10: warning: Access to field 'func' results in a dereference of a null pointer (loaded from variable 'ActiveItem') if (ActiveItem->func != F_TITLE && !ActiveItem->state) ^~~~~~~~~~ Found-by: clang static analyzer Signed-off-by: Jeremy Huddleston Acked-by: Peter Hutterer --- src/menus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/menus.c b/src/menus.c index 395426f..1bf32bf 100644 --- a/src/menus.c +++ b/src/menus.c @@ -569,7 +569,7 @@ UpdateMenu() if (!done) { ActiveItem = mi; - if (ActiveItem->func != F_TITLE && !ActiveItem->state) + if (ActiveItem && ActiveItem->func != F_TITLE && !ActiveItem->state) { ActiveItem->state = 1; PaintEntry(ActiveMenu, ActiveItem, False); @@ -577,7 +577,7 @@ UpdateMenu() } /* now check to see if we were over the arrow of a pull right entry */ - if (ActiveItem->func == F_MENU && + if (ActiveItem && ActiveItem->func == F_MENU && ((ActiveMenu->width - x) < (ActiveMenu->width >> 1))) { MenuRoot *save = ActiveMenu; -- cgit v1.2.3