aboutsummaryrefslogtreecommitdiffstats
path: root/g10/gpg.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-01-28 19:12:21 +0000
committerWerner Koch <[email protected]>2015-01-28 19:12:21 +0000
commitd8eea25b8b7becbfa3f059be6f5966a2f1aa7112 (patch)
tree6e82e33f1237fb15bce50726f5502f1af5d3e105 /g10/gpg.c
parentAdd a hook to be called right after main. (diff)
downloadgnupg-d8eea25b8b7becbfa3f059be6f5966a2f1aa7112.tar.gz
gnupg-d8eea25b8b7becbfa3f059be6f5966a2f1aa7112.zip
gpg: Fix buffering problem in --list-config.
* g10/gpg.c (list_config): Replace print_sanitized_string2 by es_write_sanitized. * common/stringhelp.c (print_sanitized_buffer2): Remove. (print_sanitized_buffer, print_sanitized_utf8_buffer): Remove. (print_sanitized_utf8_buffer, print_sanitized_utf8_string): Remove. (print_sanitized_string): Remove. * sm/certdump.c (print_dn_part, print_dn_parts): Remove arg FP. (pretty_print_sexp, gpgsm_print_name2, gpgsm_print_name): Remove. -- Mixing stdio and estream is never a good idea. This fix also allows us to remove a lot of garbage. Reported-by: Jason A. Donenfeld <[email protected]> GnuPG-bug-id: 1822 Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r--g10/gpg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 5e929d985..9a6b104c2 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1599,7 +1599,8 @@ list_config(char *items)
for(sl=iter->values;sl;sl=sl->next)
{
- print_sanitized_string2 (stdout, sl->d, ':',';');
+ es_write_sanitized (es_stdout, sl->d, strlen (sl->d),
+ ":;", NULL);
if(sl->next)
es_printf(";");
}