From c9c964c8c03c766d94d4798231d6e3db191c57df Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Wed, 11 Nov 2015 16:11:41 +1100 Subject: ui/ncurses: Check for NULL in pmenu_item_get_index() Fixes Coverity defect #30476 Signed-off-by: Samuel Mendoza-Jonas --- ui/ncurses/nc-menu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c index 3f09d62..dda7626 100644 --- a/ui/ncurses/nc-menu.c +++ b/ui/ncurses/nc-menu.c @@ -322,9 +322,10 @@ static int pmenu_item_get_index(const struct pmenu_item *item) { unsigned int i; - for (i = 0; i < item->pmenu->item_count; i++) - if (item->pmenu->items[i] == item->nci) - return i; + if (item) + for (i = 0; i < item->pmenu->item_count; i++) + if (item->pmenu->items[i] == item->nci) + return i; pb_log("%s: not found: %p %s\n", __func__, item, (item ? item->nci->name.str : "(null)")); -- cgit v1.1 From 218b5233de442ce67784f9f5e3cd43b2b3f3306b Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Wed, 11 Nov 2015 16:44:07 +1100 Subject: ui/common: Free message on return Fixes Coverity defect #30468 Signed-off-by: Samuel Mendoza-Jonas --- ui/common/discover-client.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'ui') diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c index 14f36da..71ef70b 100644 --- a/ui/common/discover-client.c +++ b/ui/common/discover-client.c @@ -181,7 +181,7 @@ static int discover_client_process(void *arg) rc = pb_protocol_deserialise_device(dev, message); if (rc) { pb_log("%s: no device?\n", __func__); - return 0; + goto out; } device_add(client, dev); @@ -192,7 +192,7 @@ static int discover_client_process(void *arg) rc = pb_protocol_deserialise_boot_option(opt, message); if (rc) { pb_log("%s: no boot_option?\n", __func__); - return 0; + goto out; } boot_option_add(client, opt); @@ -201,7 +201,7 @@ static int discover_client_process(void *arg) dev_id = pb_protocol_deserialise_string(ctx, message); if (!dev_id) { pb_log("%s: no device id?\n", __func__); - return 0; + goto out; } device_remove(client, dev_id); break; @@ -211,7 +211,7 @@ static int discover_client_process(void *arg) rc = pb_protocol_deserialise_boot_status(status, message); if (rc) { pb_log("%s: invalid status message?\n", __func__); - return 0; + goto out; } update_status(client, status); break; @@ -221,7 +221,7 @@ static int discover_client_process(void *arg) rc = pb_protocol_deserialise_system_info(sysinfo, message); if (rc) { pb_log("%s: invalid sysinfo message?\n", __func__); - return 0; + goto out; } update_sysinfo(client, sysinfo); break; @@ -231,7 +231,7 @@ static int discover_client_process(void *arg) rc = pb_protocol_deserialise_config(config, message); if (rc) { pb_log("%s: invalid config message?\n", __func__); - return 0; + goto out; } update_config(client, config); break; @@ -239,6 +239,7 @@ static int discover_client_process(void *arg) pb_log("%s: unknown action %d\n", __func__, message->action); } +out: talloc_free(ctx); return 0; -- cgit v1.1 From f5d24f2a0727a23a6a4a888651aea4232aa6e32f Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Thu, 12 Nov 2015 10:24:29 +1100 Subject: ui/ncurses: Remove redundant assignment Fixes Coverity defect #30484 Signed-off-by: Samuel Mendoza-Jonas --- ui/ncurses/nc-widgets.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/ncurses/nc-widgets.c b/ui/ncurses/nc-widgets.c index 7e03e57..98d30cc 100644 --- a/ui/ncurses/nc-widgets.c +++ b/ui/ncurses/nc-widgets.c @@ -1224,10 +1224,8 @@ void widgetset_post(struct nc_widgetset *set) post_form(set->form); form_driver(set->form, REQ_END_FIELD); - if (set->cur_field) { + if (set->cur_field) set_current_field(set->form, set->cur_field); - field = set->cur_field; - } field = current_field(set->form); widget = field_userptr(field); -- cgit v1.1