aboutsummaryrefslogtreecommitdiffstats
path: root/kbx/keybox-dump.c
diff options
context:
space:
mode:
authorJakub Jelen <[email protected]>2021-04-12 19:59:17 +0000
committerWerner Koch <[email protected]>2021-05-20 12:45:29 +0000
commitfc5fac83b778f0ff61608c286448ab7fa14ccb2d (patch)
treeeb0a9d64a542d7be3f166610f9a3ed1325900eff /kbx/keybox-dump.c
parentg10: Avoid memory leaks (diff)
downloadgnupg-fc5fac83b778f0ff61608c286448ab7fa14ccb2d.tar.gz
gnupg-fc5fac83b778f0ff61608c286448ab7fa14ccb2d.zip
kbx: Avoid uninitialized read
* kbx/kbx-client-util.c (datastream_thread): Initialize pointer * kbx/keybox-dump.c (_keybox_dump_cut_records): free blob * kbx/kbxserver.c (kbxd_start_command_handler): do not free passed ctrl * kbx/keyboxd.c (check_own_socket): free sockname -- Signed-off-by: Jakub Jelen <[email protected]> GnuPG-bug-id: 5393
Diffstat (limited to 'kbx/keybox-dump.c')
-rw-r--r--kbx/keybox-dump.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kbx/keybox-dump.c b/kbx/keybox-dump.c
index 3e66b72a1..38608ceaa 100644
--- a/kbx/keybox-dump.c
+++ b/kbx/keybox-dump.c
@@ -881,7 +881,7 @@ _keybox_dump_cut_records (const char *filename, unsigned long from,
unsigned long to, FILE *outfp)
{
estream_t fp;
- KEYBOXBLOB blob;
+ KEYBOXBLOB blob = NULL;
int rc;
unsigned long recno = 0;
@@ -902,6 +902,7 @@ _keybox_dump_cut_records (const char *filename, unsigned long from,
}
}
_keybox_release_blob (blob);
+ blob = NULL;
recno++;
}
if (rc == -1)
@@ -909,6 +910,7 @@ _keybox_dump_cut_records (const char *filename, unsigned long from,
if (rc)
fprintf (stderr, "error reading '%s': %s\n", filename, gpg_strerror (rc));
leave:
+ _keybox_release_blob (blob);
if (fp != es_stdin)
es_fclose (fp);
return rc;