914567e4a7
Without the change the build fails as:
spdk_top.c:1949:69: error: format not a string literal and no format arguments [-Werror=format-security]
1949 | mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time);
| ^~~~~~~~~
48 lines
2.9 KiB
Diff
48 lines
2.9 KiB
Diff
Backport of upstream https://review.spdk.io/gerrit/c/spdk/spdk/+/10300
|
|
--- a/app/spdk_top/spdk_top.c
|
|
+++ b/app/spdk_top/spdk_top.c
|
|
@@ -1012 +1012 @@ print_max_len(WINDOW *win, int row, uint16_t col, uint16_t max_len, enum str_ali
|
|
- mvwprintw(win, row, col, tmp_str);
|
|
+ mvwprintw(win, row, col, "%s", tmp_str);
|
|
@@ -1944 +1944 @@ display_thread(struct rpc_thread_info *thread_info)
|
|
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%" PRIu64,
|
|
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%d",
|
|
@@ -1949 +1949 @@ display_thread(struct rpc_thread_info *thread_info)
|
|
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time);
|
|
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time);
|
|
@@ -1951 +1951 @@ display_thread(struct rpc_thread_info *thread_info)
|
|
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time);
|
|
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time);
|
|
@@ -1954 +1954 @@ display_thread(struct rpc_thread_info *thread_info)
|
|
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time);
|
|
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time);
|
|
@@ -1956 +1956 @@ display_thread(struct rpc_thread_info *thread_info)
|
|
- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time);
|
|
+ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time);
|
|
@@ -2111 +2111 @@ show_core(uint8_t current_page)
|
|
- mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, idle_time);
|
|
+ mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, "%s", idle_time);
|
|
@@ -2118 +2118 @@ show_core(uint8_t current_page)
|
|
- mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, busy_time);
|
|
+ mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, "%s", busy_time);
|
|
@@ -2124 +2124 @@ show_core(uint8_t current_page)
|
|
- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name);
|
|
+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name);
|
|
@@ -2137 +2137 @@ show_core(uint8_t current_page)
|
|
- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name);
|
|
+ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name);
|
|
@@ -2214 +2214 @@ show_poller(uint8_t current_page)
|
|
- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL,
|
|
+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, "%s",
|
|
@@ -2216 +2216 @@ show_poller(uint8_t current_page)
|
|
- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, poller->thread_name);
|
|
+ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, "%s", poller->thread_name);
|
|
@@ -2231 +2231 @@ show_poller(uint8_t current_page)
|
|
- mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, poller_period);
|
|
+ mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, "%s", poller_period);
|
|
@@ -2264 +2264 @@ print_bottom_error_message(char *msg)
|
|
- mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, msg);
|
|
+ mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, "%s", msg);
|
|
@@ -2434 +2434 @@ show_stats(pthread_t *data_thread)
|
|
- mvprintw(g_max_row - 1, 1, current_page_str);
|
|
+ mvprintw(g_max_row - 1, 1, "%s", current_page_str);
|