Blob Blame History Raw
commit d91bbf6f475e7ea39f131b77ce91b2de9646d5ca
Author: Victor Buttner <victor@0x23.dk>
Date:   Mon Nov 22 00:25:25 2021 +0100

    ncurses: always use "%s"-style format for printf()-style functions

diff --git a/src/ncurses-callbacks.c b/src/ncurses-callbacks.c
index 4a6f154f094bfebf..c5ffd11a3c64fecf 100644
--- a/src/ncurses-callbacks.c
+++ b/src/ncurses-callbacks.c
@@ -166,7 +166,7 @@ ncurses_c_refresh_mwindow(u_int8_t mode, WINDOW *mwindow, u_int8_t pointer,
    position = 1;
    for (i = 0; i < protocols[mode].nparams; i++) {
       if (params[i].mwindow) {
-         mvwprintw(mwindow, 1, position + offset, params[i].ldesc);
+         mvwprintw(mwindow, 1, position + offset, "%s", params[i].ldesc);
          if (params[i].meaning)
          {
             max_len = parser_get_max_field_length(params[i].meaning);
@@ -179,7 +179,7 @@ ncurses_c_refresh_mwindow(u_int8_t mode, WINDOW *mwindow, u_int8_t pointer,
 
    for (i = 0; i < protocols[mode].extra_nparams; i++) {
       if (extra_params[i].mwindow) {
-         mvwprintw(mwindow, 1, position + offset, extra_params[i].ldesc);
+         mvwprintw(mwindow, 1, position + offset, "%s", extra_params[i].ldesc);
          if (extra_params[i].meaning)
          {
             max_len = parser_get_max_field_length(extra_params[i].meaning);
diff --git a/src/ncurses-interface.c b/src/ncurses-interface.c
index ba0abdb48121f75f..cf6457f3c6318cf2 100644
--- a/src/ncurses-interface.c
+++ b/src/ncurses-interface.c
@@ -1167,14 +1167,14 @@ ncurses_i_error_window(u_int8_t mode, char *message, ...)
       if (message_s >= max_y - 4) {
          strncpy(m_split, ptr, max_y - 4);
          m_split[max_y-4] = '\0';
-         mvwprintw(my_window, i, 2, m_split);
+         mvwprintw(my_window, i, 2, "%s", m_split);
          message_s -= max_y - 4;
          ptr += max_y - 4;
          /* offset */
       } else {
          strncpy(m_split, ptr, message_s);
          m_split[message_s] = '\0';
-         mvwprintw(my_window, i, 2, m_split);
+         mvwprintw(my_window, i, 2, "%s", m_split);
          message_s = 0;
       }
       i++;
@@ -1224,7 +1224,7 @@ ncurses_i_getstring_window(struct term_node *term, char *status, char *data, u_i
    wattron(my_window, COLOR_PAIR(3));
    box(my_window, 0, 0);
 
-   mvwprintw(my_window, 0, 2, message);
+   mvwprintw(my_window, 0, 2, "%s", message);
 
    mvwprintw(my_window, max_x - 1, 2, " Press Enter to continue ");
    wattroff(my_window, COLOR_PAIR(3));
@@ -1278,13 +1278,13 @@ ncurses_i_getconfirm(struct term_node *term, char *status, char *message, char *
    wattron(my_window, COLOR_PAIR(3));
    box(my_window, 0, 0);
 
-   mvwprintw(my_window, 0, 2, title);
+   mvwprintw(my_window, 0, 2, "%s", title);
 
-   mvwprintw(my_window, max_y - 1, 2, bottom);
+   mvwprintw(my_window, max_y - 1, 2, "%s", bottom);
 
    wattroff(my_window, COLOR_PAIR(3));
 
-   mvwprintw(my_window, max_y - 3, 1, message);
+   mvwprintw(my_window, max_y - 3, 1, "%s", message);
 
    wtimeout(my_window,NCURSES_KEY_TIMEOUT); /* Block for 100 millisecs...*/
 
@@ -1793,7 +1793,7 @@ ncurses_i_attack_get_params(struct attack_param *param, u_int8_t nparams)
 
    mvwprintw(my_window, 0, 2, "Attack parameters");
 
-   mvwprintw(my_window, max_y - 1, 2, bottom);
+   mvwprintw(my_window, max_y - 1, 2, "%s", bottom);
    wattroff(my_window, COLOR_PAIR(3));
 
    wmove(my_window, max_x - 3, 1);