ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spdk_top: one more round of allocation checking.

Browse Source 
The last round of kw fixes introduced one more kw warning
for null pointer dereferences relating to draw_filtering_menu.
This will resolve all of those.

Signed-off-by: Seth Howell <seth.howell@intel.com>
Change-Id: Iaeec3694cd951fcd3e0d4de235221b2645bcd0c9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2053
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Maciej Szwed <maciej.szwed@intel.com>
This commit is contained in:
Seth Howell 2020-04-27 09:31:53 -07:00 committed by Tomasz Zawadzki
parent 6395370be1
commit 0d5541fa8e
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/spdk_top/spdk_top.c
View File

@ -1483,6 +1483,9 @@ filter_columns(uint8_t tab)
mvwaddch(filter_win, WINDOW_HEADER_END_LINE, len + WINDOW_BORDER_LEN - 1, ACS_RTEE); mvwaddch(filter_win, WINDOW_HEADER_END_LINE, len + WINDOW_BORDER_LEN - 1, ACS_RTEE);
my_items = draw_filtering_menu(0, filter_win, tab, &my_menu); my_items = draw_filtering_menu(0, filter_win, tab, &my_menu);
if (my_items == NULL || my_menu == NULL) {
goto fail;
}
while (!stop_loop) { while (!stop_loop) {
c = wgetch(filter_win); c = wgetch(filter_win);
@ -1504,6 +1507,9 @@ filter_columns(uint8_t tab)
col_desc[current_index].disabled = !col_desc[current_index].disabled; col_desc[current_index].disabled = !col_desc[current_index].disabled;
my_items = refresh_filtering_menu(&my_menu, filter_win, tab, my_items, elements, my_items = refresh_filtering_menu(&my_menu, filter_win, tab, my_items, elements,
item_index(cur) + 1); item_index(cur) + 1);
if (my_items == NULL || my_menu == NULL) {
goto fail;
}
break; break;
case 10: /* Enter */ case 10: /* Enter */
cur = current_item(my_menu); cur = current_item(my_menu);
@ -1516,6 +1522,9 @@ filter_columns(uint8_t tab)
col_desc[current_index].disabled = !col_desc[current_index].disabled; col_desc[current_index].disabled = !col_desc[current_index].disabled;
my_items = refresh_filtering_menu(&my_menu, filter_win, tab, my_items, elements, my_items = refresh_filtering_menu(&my_menu, filter_win, tab, my_items, elements,
item_index(cur) + 1); item_index(cur) + 1);
if (my_items == NULL || my_menu == NULL) {
goto fail;
}
} }
break; break;
} }
@ -1529,6 +1538,11 @@ filter_columns(uint8_t tab)
wclear(g_menu_win); wclear(g_menu_win);
draw_menu_win(); draw_menu_win();
return;
fail:
fprintf(stderr, "Unable to filter the columns due to allocation failure.\n");
assert(false);
} }
static void static void