mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Assorted memory leak fixes on the error code paths.
-- These are taken from these commits:98c52ae
* card: Intialize pointer to avoid double freefc5fac8
* kbx: Avoid uninitialized readfa0771f
* g10: Avoid memory leaks25aa353
* dirmgr: Avoid double free33a2362
* agent: Fix memory leakse6132bc
* sm: Avoid memory leaks and double double-free2af7bb2
* g10: Fix memory leaks0d2c1e9
* dirmgr: clean up memory on error code paths GnuPG-bug-id: 5393 Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
9d63ba2721
commit
b677e2ec98
5 changed files with 23 additions and 8 deletions
25
sm/server.c
25
sm/server.c
|
@ -724,8 +724,13 @@ cmd_export (assuan_context_t ctx, char *line)
|
|||
|
||||
if (opt_secret)
|
||||
{
|
||||
if (!list || !*list->d)
|
||||
if (!list)
|
||||
return set_error (GPG_ERR_NO_DATA, "No key given");
|
||||
if (!*list->d)
|
||||
{
|
||||
free_strlist (list);
|
||||
return set_error (GPG_ERR_NO_DATA, "No key given");
|
||||
}
|
||||
if (list->next)
|
||||
return set_error (GPG_ERR_TOO_MANY, "Only one key allowed");
|
||||
}
|
||||
|
@ -948,17 +953,27 @@ do_listkeys (assuan_context_t ctx, char *line, int mode)
|
|||
int outfd = translate_sys2libc_fd (assuan_get_output_fd (ctx), 1);
|
||||
|
||||
if ( outfd == -1 )
|
||||
return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL);
|
||||
{
|
||||
free_strlist (list);
|
||||
return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL);
|
||||
}
|
||||
fp = es_fdopen_nc (outfd, "w");
|
||||
if (!fp)
|
||||
return set_error (gpg_err_code_from_syserror (), "es_fdopen() failed");
|
||||
{
|
||||
free_strlist (list);
|
||||
return set_error (gpg_err_code_from_syserror (),
|
||||
"es_fdopen() failed");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
fp = es_fopencookie (ctx, "w", data_line_cookie_functions);
|
||||
if (!fp)
|
||||
return set_error (GPG_ERR_ASS_GENERAL,
|
||||
"error setting up a data stream");
|
||||
{
|
||||
free_strlist (list);
|
||||
return set_error (GPG_ERR_ASS_GENERAL,
|
||||
"error setting up a data stream");
|
||||
}
|
||||
}
|
||||
|
||||
ctrl->with_colons = 1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue