From 0d5541fa8e6b0752eae047c2e35da6c57db470aa Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Mon, 27 Apr 2020 09:31:53 -0700 Subject: [PATCH] spdk_top: one more round of allocation checking. 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 Change-Id: Iaeec3694cd951fcd3e0d4de235221b2645bcd0c9 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2053 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki Reviewed-by: Maciej Szwed --- app/spdk_top/spdk_top.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/spdk_top/spdk_top.c b/app/spdk_top/spdk_top.c index fc2c0547d..165418cfb 100644 --- a/app/spdk_top/spdk_top.c +++ b/app/spdk_top/spdk_top.c @@ -1483,6 +1483,9 @@ filter_columns(uint8_t tab) 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); + if (my_items == NULL || my_menu == NULL) { + goto fail; + } while (!stop_loop) { c = wgetch(filter_win); @@ -1504,6 +1507,9 @@ filter_columns(uint8_t tab) col_desc[current_index].disabled = !col_desc[current_index].disabled; my_items = refresh_filtering_menu(&my_menu, filter_win, tab, my_items, elements, item_index(cur) + 1); + if (my_items == NULL || my_menu == NULL) { + goto fail; + } break; case 10: /* Enter */ cur = current_item(my_menu); @@ -1516,6 +1522,9 @@ filter_columns(uint8_t tab) col_desc[current_index].disabled = !col_desc[current_index].disabled; my_items = refresh_filtering_menu(&my_menu, filter_win, tab, my_items, elements, item_index(cur) + 1); + if (my_items == NULL || my_menu == NULL) { + goto fail; + } } break; } @@ -1529,6 +1538,11 @@ filter_columns(uint8_t tab) wclear(g_menu_win); draw_menu_win(); + return; + +fail: + fprintf(stderr, "Unable to filter the columns due to allocation failure.\n"); + assert(false); } static void