OpenWrt/coolsnowwolf-packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages synced 2025-01-08 11:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "mtr: ui/curses: always use "%s"-style format for printf()-style functions"

Browse Source 
This reverts commit 06ee64da00.
This commit is contained in:
Beginner-Go 2022-03-23 10:49:43 +00:00
parent 06ee64da00
commit c050fa19b8
1 changed files with 0 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
net/mtr/patches/001-use-printf-style-function.patch
View File

@ -1,69 +0,0 @@
From aeb493e08eabcb4e6178bda0bb84e9cd01c9f213 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 1 Nov 2021 07:36:06 +0000
Subject: [PATCH] ui/curses: always use "%s"-style format for printf()-style
functions
`ncuses-6.3` added printf-style function attributes and now makes
it easier to catch cases when user input is used in palce of format
string when built with CFLAGS=-Werror=format-security:
ui/curses.c:765:42:
error: format not a string literal and no format arguments [-Werror=format-security]
765 | mvprintw(rowstat - 1, startstat, msg);
| ^~~
Let's wrap all the missing places with "%s" format.
---
ui/curses.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ui/curses.c b/ui/curses.c
index de6cea9..d01e178 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -432,7 +432,7 @@ static void mtr_curses_hosts(
attron(A_BOLD);
#ifdef HAVE_IPINFO
if (is_printii(ctl))
- printw(fmt_ipinfo(ctl, addr));
+ printw("%s", fmt_ipinfo(ctl, addr));
#endif
if (name != NULL) {
if (ctl->show_ips)
@@ -485,7 +485,7 @@ static void mtr_curses_hosts(
printw("\n ");
#ifdef HAVE_IPINFO
if (is_printii(ctl))
- printw(fmt_ipinfo(ctl, addrs));
+ printw("%s", fmt_ipinfo(ctl, addrs));
#endif
if (name != NULL) {
if (ctl->show_ips)
@@ -650,7 +650,7 @@ static void mtr_curses_graph(
#ifdef HAVE_IPINFO
if (is_printii(ctl))
- printw(fmt_ipinfo(ctl, addr));
+ printw("%s", fmt_ipinfo(ctl, addr));
#endif
name = dns_lookup(ctl, addr);
printw("%s", name ? name : strlongip(ctl->af, addr));
@@ -702,7 +702,7 @@ void mtr_curses_redraw(
ctl->LocalHostname, net_localaddr(),
ctl->Hostname, net_remoteaddr());
t = time(NULL);
- mvprintw(1, maxx - 25, iso_time(&t));
+ mvprintw(1, maxx - 25, "%s", iso_time(&t));
printw("\n");
printw("Keys: ");
@@ -762,7 +762,7 @@ void mtr_curses_redraw(
startstat = padding - 2;
snprintf(msg, sizeof(msg), " Last %3d pings", max_cols);
- mvprintw(rowstat - 1, startstat, msg);
+ mvprintw(rowstat - 1, startstat, "%s", msg);
attroff(A_BOLD);
move(rowstat, 0);