talons

Fork of Claws Mail https://www.claws-mail
Log | Files | Refs | README | LICENSE

commit 24f49cb6a765ec9d6b6f53dc60239e9cc7c0d091
parent d7e8f002018245de9443feb1ad88ce9c176dfef0
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 13 Nov 2015 10:21:02 +0100

Fix null pointer dereference

Diffstat:
Msrc/plugins/mailmbox/plugin_gtk.c | 16++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/mailmbox/plugin_gtk.c b/src/plugins/mailmbox/plugin_gtk.c @@ -146,16 +146,16 @@ static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item) #define SET_SENS(name, sens) \ cm_menu_set_sensitive_full(ui_manager, "Popup/"name, sens) - SET_SENS("FolderViewPopup/CreateNewFolder", item->stype != F_INBOX); - SET_SENS("FolderViewPopup/RenameFolder", item->stype == F_NORMAL && folder_item_parent(item) != NULL); - SET_SENS("FolderViewPopup/MoveFolder", folder_is_normal && folder_item_parent(item) != NULL); - SET_SENS("FolderViewPopup/DeleteFolder", item->stype == F_NORMAL && folder_item_parent(item) != NULL); + SET_SENS("FolderViewPopup/CreateNewFolder", item && item->stype != F_INBOX); + SET_SENS("FolderViewPopup/RenameFolder", item && item->stype == F_NORMAL && folder_item_parent(item) != NULL); + SET_SENS("FolderViewPopup/MoveFolder", folder_is_normal && folder_item_parent(item) != NULL); + SET_SENS("FolderViewPopup/DeleteFolder", item && item->stype == F_NORMAL && folder_item_parent(item) != NULL); - SET_SENS("FolderViewPopup/CheckNewMessages", folder_item_parent(item) == NULL); - SET_SENS("FolderViewPopup/CheckNewFolders", folder_item_parent(item) == NULL); - SET_SENS("FolderViewPopup/RebuildTree", folder_item_parent(item) == NULL); + SET_SENS("FolderViewPopup/CheckNewMessages", folder_item_parent(item) == NULL); + SET_SENS("FolderViewPopup/CheckNewFolders", folder_item_parent(item) == NULL); + SET_SENS("FolderViewPopup/RebuildTree", folder_item_parent(item) == NULL); - SET_SENS("FolderViewPopup/RemoveMailbox", folder_item_parent(item) == NULL); + SET_SENS("FolderViewPopup/RemoveMailbox", folder_item_parent(item) == NULL); #undef SET_SENS }