From fa0771f609b5fcb104c64a11aefc501b7a91696d Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 12 Apr 2021 20:05:48 +0200 Subject: g10: Avoid memory leaks * g10/call-agent.c (card_keyinfo_cb): free keyinfo. Restructure to avoid backward gotos. * g10/keyedit.c (menu_set_keyserver_url): properly enclose the block * g10/keygen.c (gen_card_key): free pk and pkt -- Signed-off-by: Jakub Jelen GnuPG-bug-id: 5393 Additional changes: - Restructure to avoid backward gotos. Signed-off-by: Werner Koch --- g10/keyedit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'g10/keyedit.c') diff --git a/g10/keyedit.c b/g10/keyedit.c index 7255676e7..122548df5 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -5382,14 +5382,16 @@ menu_set_keyserver_url (ctrl_t ctrl, const char *url, kbnode_t pub_keyblock) uri ? _("Are you sure you want to replace it? (y/N) ") : _("Are you sure you want to delete it? (y/N) "))) - xfree (user); - continue; + { + xfree (user); + continue; + } } else if (uri == NULL) { /* There is no current keyserver URL, so there is no point in trying to un-set it. */ - xfree (user); + xfree (user); continue; } -- cgit v1.2.3