From 854bf41deb3488773d21a1dabbd29d2dfbb1bd88 Mon Sep 17 00:00:00 2001

From: Jakub Jelen <jjelen@redhat.com>

Date: Fri, 9 Apr 2021 16:13:07 +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 <jjelen@redhat.com>

---

 g10/card-util.c | 2 +-

 g10/tofu.c      | 2 ++

 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/g10/card-util.c b/g10/card-util.c

index d680c4d0a..f94cf887e 100644

--- a/g10/card-util.c

+++ b/g10/card-util.c

@@ -127,7 +127,7 @@ change_pin (int unblock_v2, int allow_admin)

   else

     for (;;)

       {

-	char *answer;

+	char *answer = NULL;

 	tty_printf ("\n");

 	tty_printf ("1 - change PIN\n"

diff --git a/g10/tofu.c b/g10/tofu.c

index 83786a08d..31da6ea9d 100644

--- a/g10/tofu.c

+++ b/g10/tofu.c

@@ -1707,6 +1707,8 @@ ask_about_binding (ctrl_t ctrl,

          GPGSQL_ARG_END);

       if (rc)

         {

+          sqlite3_free (sqerr);

+          sqerr = NULL;

           rc = gpg_error (GPG_ERR_GENERAL);

           break;

         }

-- 

2.25.4