123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180 |
- Subject: [PATCH] idn: fix printf() format security warnings
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- | ../../libidn-1.32/src/idn.c: In function 'main':
- | ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and no format arguments [-Werror=format-security]
- | error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be specified"));
- | ^~~~~
- | ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and no format arguments [-Werror=format-security]
- | fprintf (stderr, _("Type each input string on a line by itself, "
- | ^~~~~~~
- | ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and no format arguments [-Werror=format-security]
- | error (EXIT_FAILURE, errno, _("input error"));
- | ^~~~~
- | ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and no format arguments [-Werror=format-security]
- | _("could not convert from UTF-8 to UCS-4"));
- | ^
- | ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and no format arguments [-Werror=format-security]
- | _("could not convert from UTF-8 to UCS-4"));
- | ^
- | ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and no format arguments [-Werror=format-security]
- | _("could not convert from UTF-8 to UCS-4"));
- | ^
- | ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and no format arguments [-Werror=format-security]
- | _("could not convert from UCS-4 to UTF-8"));
- | ^
- | ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and no format arguments [-Werror=format-security]
- | _("could not convert from UCS-4 to UTF-8"));
- | ^
- | ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and no format arguments [-Werror=format-security]
- | _("could not convert from UCS-4 to UTF-8"));
- | ^
- | ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and no format arguments [-Werror=format-security]
- | _("could not convert from UTF-8 to UCS-4"));
- | ^
- | ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and no format arguments [-Werror=format-security]
- | _("could not convert from UTF-8 to UCS-4"));
- | ^
- | ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and no format arguments [-Werror=format-security]
- | error (EXIT_FAILURE, 0, _("could not do NFKC normalization"));
- | ^~~~~
- | ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and no format arguments [-Werror=format-security]
- | _("could not convert from UTF-8 to UCS-4"));
- | ^
- Signed-off-by: André Draszik <adraszik@tycoint.com>
- Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
- Upstream-Status: Pending
- ---
- src/idn.c | 27 ++++++++++++++-------------
- 1 file changed, 14 insertions(+), 13 deletions(-)
- diff --git a/src/idn.c b/src/idn.c
- index f2fee11..c6e5caa 100644
- --- a/src/idn.c
- +++ b/src/idn.c
- @@ -169,7 +169,7 @@ main (int argc, char *argv[])
- (args_info.idna_to_unicode_given ? 1 : 0) +
- (args_info.nfkc_given ? 1 : 0) != 1)
- {
- - error (0, 0,
- + error (0, 0, "%s",
- _("only one of -s, -e, -d, -a, -u or -n can be specified"));
- usage (EXIT_FAILURE);
- }
- @@ -183,7 +183,7 @@ main (int argc, char *argv[])
-
- if (!args_info.quiet_given
- && args_info.inputs_num == 0 && isatty (fileno (stdin)))
- - fprintf (stderr, _("Type each input string on a line by itself, "
- + fprintf (stderr, "%s", _("Type each input string on a line by itself, "
- "terminated by a newline character.\n"));
-
- do
- @@ -195,7 +195,7 @@ main (int argc, char *argv[])
- if (feof (stdin))
- break;
-
- - error (EXIT_FAILURE, errno, _("input error"));
- + error (EXIT_FAILURE, errno, "%s", _("input error"));
- }
-
- if (strlen (line) > 0)
- @@ -213,7 +213,7 @@ main (int argc, char *argv[])
- if (!q)
- {
- free (p);
- - error (EXIT_FAILURE, 0,
- + error (EXIT_FAILURE, 0, "%s",
- _("could not convert from UTF-8 to UCS-4"));
- }
-
- @@ -238,7 +238,7 @@ main (int argc, char *argv[])
- if (!q)
- {
- free (r);
- - error (EXIT_FAILURE, 0,
- + error (EXIT_FAILURE, 0, "%s",
- _("could not convert from UTF-8 to UCS-4"));
- }
-
- @@ -275,7 +275,7 @@ main (int argc, char *argv[])
- q = stringprep_utf8_to_ucs4 (p, -1, &len);
- free (p);
- if (!q)
- - error (EXIT_FAILURE, 0,
- + error (EXIT_FAILURE, 0, "%s",
- _("could not convert from UTF-8 to UCS-4"));
-
- if (args_info.debug_given)
- @@ -334,7 +334,7 @@ main (int argc, char *argv[])
- r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
- free (q);
- if (!r)
- - error (EXIT_FAILURE, 0,
- + error (EXIT_FAILURE, 0, "%s",
- _("could not convert from UCS-4 to UTF-8"));
-
- p = stringprep_utf8_to_locale (r);
- @@ -358,7 +358,7 @@ main (int argc, char *argv[])
- q = stringprep_utf8_to_ucs4 (p, -1, NULL);
- free (p);
- if (!q)
- - error (EXIT_FAILURE, 0,
- + error (EXIT_FAILURE, 0, "%s",
- _("could not convert from UCS-4 to UTF-8"));
-
- if (args_info.debug_given)
- @@ -436,7 +436,7 @@ main (int argc, char *argv[])
- if (!q)
- {
- free (p);
- - error (EXIT_FAILURE, 0,
- + error (EXIT_FAILURE, 0, "%s",
- _("could not convert from UCS-4 to UTF-8"));
- }
-
- @@ -492,7 +492,7 @@ main (int argc, char *argv[])
- r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
- free (q);
- if (!r)
- - error (EXIT_FAILURE, 0,
- + error (EXIT_FAILURE, 0, "%s",
- _("could not convert from UTF-8 to UCS-4"));
-
- p = stringprep_utf8_to_locale (r);
- @@ -521,7 +521,7 @@ main (int argc, char *argv[])
- if (!q)
- {
- free (p);
- - error (EXIT_FAILURE, 0,
- + error (EXIT_FAILURE, 0, "%s",
- _("could not convert from UTF-8 to UCS-4"));
- }
-
- @@ -535,7 +535,8 @@ main (int argc, char *argv[])
- r = stringprep_utf8_nfkc_normalize (p, -1);
- free (p);
- if (!r)
- - error (EXIT_FAILURE, 0, _("could not do NFKC normalization"));
- + error (EXIT_FAILURE, 0, "%s",
- + _("could not do NFKC normalization"));
-
- if (args_info.debug_given)
- {
- @@ -545,7 +546,7 @@ main (int argc, char *argv[])
- if (!q)
- {
- free (r);
- - error (EXIT_FAILURE, 0,
- + error (EXIT_FAILURE, 0, "%s",
- _("could not convert from UTF-8 to UCS-4"));
- }
-
- --
- 2.25.1
|