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

app/spdk_top: check NULL pointer after use newwin or new_panel

Browse Source 
When use newwin or new_panel function, the return value maybe NULL. Check the return value before use it will be more safe.

Signed-off-by: sunshihao <sunshihao@huawei.com>
Signed-off-by: linfeilong <linfeilong@huawei.com>
Signed-off-by: liuzhqiang <liuzhiqiang26@huawei.com>
Signed-off-by: suweifeng <suweifeng1@huawei.com>
Change-Id: Ifef8ed91b778cc4577cec1834f6596c58643e5c4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5050
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
sunshihao520 2020-11-09 10:41:45 +08:00 committed by Jim Harris
parent 1d03a9baf4
commit be979ad11e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/spdk_top/spdk_top.c
View File

@ -1485,8 +1485,10 @@ filter_columns(uint8_t tab)
filter_win = newwin(elements + WINDOW_HEADER_LEN, len + WINDOW_BORDER_LEN, filter_win = newwin(elements + WINDOW_HEADER_LEN, len + WINDOW_BORDER_LEN,
(g_max_row - elements - 1) / 2, (g_max_col - len) / 2); (g_max_row - elements - 1) / 2, (g_max_col - len) / 2);
assert(filter_win != NULL);
keypad(filter_win, TRUE); keypad(filter_win, TRUE);
filter_panel = new_panel(filter_win); filter_panel = new_panel(filter_win);
assert(filter_panel != NULL);
top_panel(filter_panel); top_panel(filter_panel);
update_panels(); update_panels();
@ -1611,8 +1613,10 @@ change_sorting(uint8_t tab)
sort_win = newwin(elements + WINDOW_HEADER_LEN, len + WINDOW_BORDER_LEN, (g_max_row - elements) / 2, sort_win = newwin(elements + WINDOW_HEADER_LEN, len + WINDOW_BORDER_LEN, (g_max_row - elements) / 2,
(g_max_col - len) / 2); (g_max_col - len) / 2);
assert(sort_win != NULL);
keypad(sort_win, TRUE); keypad(sort_win, TRUE);
sort_panel = new_panel(sort_win); sort_panel = new_panel(sort_win);
assert(sort_panel != NULL);
top_panel(sort_panel); top_panel(sort_panel);
update_panels(); update_panels();
@ -1683,8 +1687,10 @@ change_refresh_rate(void)
refresh_win = newwin(RR_WIN_HEIGHT, RR_WIN_WIDTH, (g_max_row - RR_WIN_HEIGHT - 1) / 2, refresh_win = newwin(RR_WIN_HEIGHT, RR_WIN_WIDTH, (g_max_row - RR_WIN_HEIGHT - 1) / 2,
(g_max_col - RR_WIN_WIDTH) / 2); (g_max_col - RR_WIN_WIDTH) / 2);
assert(refresh_win != NULL);
keypad(refresh_win, TRUE); keypad(refresh_win, TRUE);
refresh_panel = new_panel(refresh_win); refresh_panel = new_panel(refresh_win);
assert(refresh_panel != NULL);
top_panel(refresh_panel); top_panel(refresh_panel);
update_panels(); update_panels();
@ -1887,17 +1893,20 @@ draw_interface(void)
g_menu_win = newwin(MENU_WIN_HEIGHT, g_max_col, g_max_row - MENU_WIN_HEIGHT - 1, g_menu_win = newwin(MENU_WIN_HEIGHT, g_max_col, g_max_row - MENU_WIN_HEIGHT - 1,
MENU_WIN_LOCATION_COL); MENU_WIN_LOCATION_COL);
assert(g_menu_win != NULL);
draw_menu_win(); draw_menu_win();
for (i = 0; i < NUMBER_OF_TABS; i++) { for (i = 0; i < NUMBER_OF_TABS; i++) {
g_tab_win[i] = newwin(TAB_WIN_HEIGHT, g_max_col / NUMBER_OF_TABS - TABS_SPACING, g_tab_win[i] = newwin(TAB_WIN_HEIGHT, g_max_col / NUMBER_OF_TABS - TABS_SPACING,
TAB_WIN_LOCATION_ROW, g_max_col / NUMBER_OF_TABS * i + 1); TAB_WIN_LOCATION_ROW, g_max_col / NUMBER_OF_TABS * i + 1);
assert(g_tab_win[i] != NULL);
draw_tab_win(i); draw_tab_win(i);
g_tabs[i] = newwin(g_max_row - MENU_WIN_HEIGHT - TAB_WIN_HEIGHT - 2, g_max_col, TABS_LOCATION_ROW, g_tabs[i] = newwin(g_max_row - MENU_WIN_HEIGHT - TAB_WIN_HEIGHT - 2, g_max_col, TABS_LOCATION_ROW,
TABS_LOCATION_COL); TABS_LOCATION_COL);
draw_tabs(i, g_current_sort_col[i]); draw_tabs(i, g_current_sort_col[i]);
g_panels[i] = new_panel(g_tabs[i]); g_panels[i] = new_panel(g_tabs[i]);
assert(g_panels[i] != NULL);
} }
update_panels(); update_panels();