security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

common/iobuf.c: Don't abort freeing a pipeline if freeing a filter fails

Browse Source 
* common/iobuf.c (iobuf_cancel): Don't abort freeing a pipeline if
freeing a filter fails.  This needs to a memory leak.  Instead, keep
freeing and return the error code of the first filter that fails.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
This commit is contained in:
Neal H. Walfield 2015-08-13 10:08:32 +02:00
parent a250f73783
commit 1f94646a86
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/iobuf.c
View File

@ -1133,13 +1133,16 @@ iobuf_alloc (int use, size_t bufsize)
int int
iobuf_close (iobuf_t a) iobuf_close (iobuf_t a)
{ {
iobuf_t a2; iobuf_t a_chain;
size_t dummy_len = 0; size_t dummy_len = 0;
int rc = 0; int rc = 0;
for (; a && !rc; a = a2) for (; a; a = a_chain)
{ {
a2 = a->chain; int rc2 = 0;
a_chain = a->chain;
if (a->use == IOBUF_OUTPUT && (rc = iobuf_flush (a))) if (a->use == IOBUF_OUTPUT && (rc = iobuf_flush (a)))
log_error ("iobuf_flush failed on close: %s\n", gpg_strerror (rc)); log_error ("iobuf_flush failed on close: %s\n", gpg_strerror (rc));
@ -1147,9 +1150,14 @@ iobuf_close (iobuf_t a)
log_debug ("iobuf-%d.%d: close '%s'\n", log_debug ("iobuf-%d.%d: close '%s'\n",
a->no, a->subno, iobuf_desc (a)); a->no, a->subno, iobuf_desc (a));
if (a->filter && (rc = a->filter (a->filter_ov, IOBUFCTRL_FREE, if (a->filter && (rc2 = a->filter (a->filter_ov, IOBUFCTRL_FREE,
a->chain, NULL, &dummy_len))) a->chain, NULL, &dummy_len)))
log_error ("IOBUFCTRL_FREE failed on close: %s\n", gpg_strerror (rc)); log_error ("IOBUFCTRL_FREE failed on close: %s\n", gpg_strerror (rc));
if (! rc && rc2)
/* Whoops! An error occured. Save it in RC if we haven't
already recorded an error. */
rc = rc2;
xfree (a->real_fname); xfree (a->real_fname);
if (a->d.buf) if (a->d.buf)
{ {