Startsida Utforska Hjälp
Logga in
PUBLIC_REPOS
/
buildroot
spegling av git://git.buildroot.net/buildroot
2
1
Fork 0
Filer
Träd: b9b155e45f
Grenar Taggar
buildroot
/
package
/
liboping
/
0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch

0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch 2.2 KB
Historik Rå

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859 
  1. From 670834fd8fbd2533ea25ca83065800e924116579 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Sergei Trofimovich <slyich@gmail.com>
    3. 

  3. Date: Mon, 15 Nov 2021 08:05:43 +0000
    4. 

  4. Subject: [PATCH] src/oping.c: always use "%s"-style format for
    5. 

  5.  printf()-style functions
    6. 

  6. 

  7. `ncuses-6.3` added printf-style function attributes and now makes
    8. 

  8. it easier to catch cases when user input is used in palce of format
    9. 

  9. string when built with CFLAGS=-Werror=format-security:
    10. 

  10. 

  11.     oping.c:1265:41: error: format not a string literal and no format arguments [-Werror=format-security]
    12. 

  12.      1265 |                                         hist_symbols_utf8[index]);
    13. 

  13.           |                                         ^~~~~~~~~~~~~~~~~
    14. 

  14. 

  15. Let's wrap all the missing places with "%s" format.
    16. 

  16. 

  17. Downloaded from upstream PR https://github.com/octo/liboping/pull/61
    18. 

  18. 

  19. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
    20. 

  20. [Bernd: rebased for liboping version 1.10.0]
    21. 

  21. ---
    22. 

  22.  src/oping.c | 7 +++----
    23. 

  23.  1 file changed, 3 insertions(+), 4 deletions(-)
    24. 

  24. 

  25. diff --git a/src/oping.c b/src/oping.c
    26. 

  26. index c087c80..af4a0cb 100644
    27. 

  27. --- a/src/oping.c
    28. 

  28. +++ b/src/oping.c
    29. 

  29. @@ -1156,7 +1156,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */
    30. 

  30.  			wattron (ctx->window, COLOR_PAIR(color));
    31. 

  31.  
    32. 

  32.  		if (has_utf8())
    33. 

  33. -			mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol);
    34. 

  34. +			mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol);
    35. 

  35.  		else
    36. 

  36.  			mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc);
    37. 

  37.  
    38. 

  38. @@ -1262,7 +1262,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */
    39. 

  39.  			mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' ');
    40. 

  40.  		else if (has_utf8 ())
    41. 

  41.  			mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2,
    42. 

  42. -					hist_symbols_utf8[index]);
    43. 

  43. +					"%s", hist_symbols_utf8[index]);
    44. 

  44.  		else
    45. 

  45.  			mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2,
    46. 

  46.  					hist_symbols_acs[index] | A_ALTCHARSET);
    47. 

  47. @@ -1639,8 +1639,7 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */
    48. 

  48.  
    49. 

  49.  			HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ",
    50. 

  50.  					data_len, context->host, context->addr,
    51. 

  51. -					sequence, recv_ttl,
    52. 

  52. -					format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
    53. 

  53. +					sequence, recv_ttl);
    54. 

  54.  			if ((recv_qos != 0) || (opt_send_qos != 0))
    55. 

  55.  			{
    56. 

  56.  				HOST_PRINTF ("qos=%s ",
    57. 

  57. -- 
    58. 

  58. 2.34.1
    59. 

  59.