From 1b84d649eacf87ff16289c86939a4846a0d26c12 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 2 Sep 2025 13:31:33 +0900
Subject: dirmngr,gpg,scd,sm,tools: Minor fixes for es_free.

* dirmngr/crlfetch.c (fetch_cert_by_url): Use es_free.
* g10/revoke.c (gen_standard_revoke): Likewise.
* g10/tofu.c (ask_about_binding): Likewise.
* scd/command.c (cmd_readkey): Likewise.
* sm/sign.c (gpgsm_sign): Likewise.
* tools/gpg-wks-client.c (command_create): Likewise.
* tools/call-dirmngr.c (wkd_get_policy_flags): Clean up no use of
BUFFER.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 dirmngr/crlfetch.c     | 2 +-
 g10/revoke.c           | 2 +-
 g10/tofu.c             | 2 +-
 scd/command.c          | 1 +
 sm/sign.c              | 2 +-
 tools/call-dirmngr.c   | 2 --
 tools/gpg-wks-client.c | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dirmngr/crlfetch.c b/dirmngr/crlfetch.c
index 620edf788..67599cf66 100644
--- a/dirmngr/crlfetch.c
+++ b/dirmngr/crlfetch.c
@@ -516,7 +516,7 @@ fetch_cert_by_url (ctrl_t ctrl, const char *url,
         }
 
       err = ksba_cert_init_from_mem (cert, der, derlen);
-      xfree (der);
+      es_free (der);
       if (err)
         goto leave;
     }
diff --git a/g10/revoke.c b/g10/revoke.c
index f0110174f..aff5d366f 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -611,7 +611,7 @@ gen_standard_revoke (ctrl_t ctrl, PKT_public_key *psk, const char *cache_nonce)
   if (!rc && !opt.quiet)
     log_info (_("revocation certificate stored as '%s.rev'\n"), fname);
 
-  xfree (leadin);
+  es_free (leadin);
   xfree (fname);
 
   return rc;
diff --git a/g10/tofu.c b/g10/tofu.c
index a4ef1a184..740ee6475 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2029,7 +2029,7 @@ ask_about_binding (ctrl_t ctrl,
 
   tofu_resume_batch_transaction (ctrl);
 
-  xfree (prompt);
+  es_free (prompt);
 
   signature_stats_free (stats);
 }
diff --git a/scd/command.c b/scd/command.c
index b0a639dde..70665d07d 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -874,6 +874,7 @@ cmd_readkey (assuan_context_t ctx, char *line)
       gcry_sexp_release (s_key);
       if (!err)
         err = assuan_send_data (ctx, buf, buflen);
+      es_free (buf);
     }
   else if (advanced)
     {
diff --git a/sm/sign.c b/sm/sign.c
index 8de79222a..19b8f1c1b 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -1163,7 +1163,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist,
       if (err)
         goto leave;
       err = write_detached_signature (ctrl, blob, bloblen, out_fp);
-      xfree (blob);
+      es_free (blob);
       if (err)
         goto leave;
     }
diff --git a/tools/call-dirmngr.c b/tools/call-dirmngr.c
index 0401af201..241338fce 100644
--- a/tools/call-dirmngr.c
+++ b/tools/call-dirmngr.c
@@ -261,7 +261,6 @@ wkd_get_policy_flags (const char *addrspec, estream_t *r_buffer)
   assuan_context_t ctx;
   struct wkd_get_parm_s parm;
   char *line = NULL;
-  char *buffer = NULL;
 
   memset (&parm, 0, sizeof parm);
   *r_buffer = NULL;
@@ -298,7 +297,6 @@ wkd_get_policy_flags (const char *addrspec, estream_t *r_buffer)
   parm.memfp = 0;
 
  leave:
-  es_free (buffer);
   es_fclose (parm.memfp);
   xfree (line);
   assuan_release (ctx);
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index 2d037faef..14854ac15 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -1453,7 +1453,7 @@ command_create (const char *fingerprint, const char *userid)
         }
       key = NULL;
       err = mime_maker_add_body_data (mime, data, datalen);
-      xfree (data);
+      es_free (data);
       if (err)
         goto leave;
     }
-- 
cgit v1.2.3