From 2af7bb2295cda5377546cedd0c906a3cff4d2427 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Thu, 20 May 2021 10:13:51 +0200 Subject: g10: Fix memory leaks * g10/card-util.c (change_pin): free answer on errors (ask_card_keyattr): free answer on error * g10/cpr.c (do_get_from_fd): free string * g10/gpg.c (check_permissions): free dir on weird error * g10/import.c (append_new_uid): release knode * g10/keyedit.c (menu_set_keyserver_url): free answer (menu_set_keyserver_url): free user * g10/keygen.c (print_status_key_not_created): move allocation after sanity check (ask_expire_interval): free answer (card_store_key_with_backup): goto leave instaed of return * g10/keyserver.c (parse_keyserver_uri): goto fail instead of return * g10/revoke.c (gen_desig_revoke): release kdbhd (gen_desig_revoke): free answer * g10/tofu.c (ask_about_binding): free sqerr and response * g10/trustdb.c (ask_ownertrust): free pk -- Signed-off-by: Jakub Jelen Further changes: * g10/card-util.c (change_pin): Do not set answer to NULL. * g10/keyedit.c(menu_set_keyserver_url): Use !func() pattern. Signed-off-by: Werner Koch GnuPG-bug-id: 5393 --- g10/cpr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'g10/cpr.c') diff --git a/g10/cpr.c b/g10/cpr.c index 5a39913c5..002656b82 100644 --- a/g10/cpr.c +++ b/g10/cpr.c @@ -527,7 +527,11 @@ do_get_from_fd ( const char *keyword, int hidden, int getbool ) write_status (STATUS_GOT_IT); if (getbool) /* Fixme: is this correct??? */ - return (string[0] == 'Y' || string[0] == 'y') ? "" : NULL; + { + char *rv = (string[0] == 'Y' || string[0] == 'y') ? "" : NULL; + xfree (string); + return rv; + } return string; } -- cgit v1.2.3