d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a memory leak when a filter fails to initialize.

Browse Source
This commit is contained in:
Tim Kientzle 2010-01-23 07:52:13 +00:00
parent 2069a5911e
commit 68c43d86d1
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/libarchive/archive_read.c
View File

@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
static int build_stream(struct archive_read *); static int build_stream(struct archive_read *);
static int choose_format(struct archive_read *); static int choose_format(struct archive_read *);
static int cleanup_filters(struct archive_read *);
static struct archive_vtable *archive_read_vtable(void); static struct archive_vtable *archive_read_vtable(void);
static int _archive_read_close(struct archive *); static int _archive_read_close(struct archive *);
static int _archive_read_finish(struct archive *); static int _archive_read_finish(struct archive *);
@ -393,14 +394,13 @@ build_stream(struct archive_read *a)
free(filter); free(filter);
return (r); return (r);
} }
a->filter = filter;
/* Verify the filter by asking it for some data. */ /* Verify the filter by asking it for some data. */
__archive_read_filter_ahead(filter, 1, &avail); __archive_read_filter_ahead(filter, 1, &avail);
if (avail < 0) { if (avail < 0) {
/* If the read failed, bail out now. */ cleanup_filters(a);
free(filter); return (ARCHIVE_FATAL);
return (avail);
} }
a->filter = filter;
} }
} }
@ -738,18 +738,10 @@ _archive_read_close(struct archive *_a)
/* TODO: Clean up the formatters. */ /* TODO: Clean up the formatters. */
/* Clean up the filter pipeline. */ /* Release the filter objects. */
while (a->filter != NULL) { r1 = cleanup_filters(a);
struct archive_read_filter *t = a->filter->upstream;
if (a->filter->close != NULL) {
r1 = (a->filter->close)(a->filter);
if (r1 < r) if (r1 < r)
r = r1; r = r1;
}
free(a->filter->buffer);
free(a->filter);
a->filter = t;
}
/* Release the bidder objects. */ /* Release the bidder objects. */
n = sizeof(a->bidders)/sizeof(a->bidders[0]); n = sizeof(a->bidders)/sizeof(a->bidders[0]);
@ -764,6 +756,25 @@ _archive_read_close(struct archive *_a)
return (r); return (r);
} }
static int
cleanup_filters(struct archive_read *a)
{
int r = ARCHIVE_OK;
/* Clean up the filter pipeline. */
while (a->filter != NULL) {
struct archive_read_filter *t = a->filter->upstream;
if (a->filter->close != NULL) {
int r1 = (a->filter->close)(a->filter);
if (r1 < r)
r = r1;
}
free(a->filter->buffer);
free(a->filter);
a->filter = t;
}
return r;
}
/* /*
* Release memory and other resources. * Release memory and other resources.
*/ */