diff options
Diffstat (limited to 'community/liboping/fix-format-string.patch')
| -rw-r--r-- | community/liboping/fix-format-string.patch | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/community/liboping/fix-format-string.patch b/community/liboping/fix-format-string.patch index b492ab172e2..4e344176103 100644 --- a/community/liboping/fix-format-string.patch +++ b/community/liboping/fix-format-string.patch @@ -1,15 +1,30 @@ -Without this patch the printf invocation takes more argument that it has -format strings, since the format_qos() output string is printed in the -if statement following the HOST_PRINTF invocation, I believe this to be -an accidental error made in the following commit: +See: - https://github.com/octo/liboping/commit/66464b61f8ee756dcfc0081944f4367da2b1a6ab - -See https://github.com/octo/liboping/pull/60 +* https://github.com/octo/liboping/pull/60 +* https://bugs.debian.org/997189 +* https://salsa.debian.org/debian/liboping/-/blob/debian/debian/patches/fix_HOST_PRINTF_format_string.patch diff -upr liboping-1.10.0.orig/src/oping.c liboping-1.10.0/src/oping.c ---- liboping-1.10.0.orig/src/oping.c 2021-10-24 13:13:36.850533766 +0200 -+++ liboping-1.10.0/src/oping.c 2021-10-24 13:13:49.790711547 +0200 +--- liboping-1.10.0.orig/src/oping.c 2022-02-22 20:17:48.000000000 +0100 ++++ liboping-1.10.0/src/oping.c 2022-02-22 20:22:23.000000000 +0100 +@@ -1125,7 +1125,7 @@ static int update_graph_prettyping (ping + wattron (ctx->window, COLOR_PAIR(color)); + + if (has_utf8()) +- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol); ++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc); + +@@ -1223,7 +1223,7 @@ static int update_graph_histogram (ping_ + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' '); + else if (has_utf8 ()) + mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, +- hist_symbols_utf8[index]); ++ "%s", hist_symbols_utf8[index]); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, + hist_symbols_acs[index] | A_ALTCHARSET); @@ -1600,8 +1600,7 @@ static void update_host_hook (pingobj_it HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ", |