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

Fix a memory leak: Release the current list of /set keywords

Browse Source 
even when we exit on an error.
This commit is contained in:
Tim Kientzle 2009-04-17 01:02:56 +00:00
parent 7ea8a85dbc
commit c190973e9d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libarchive/archive_read_support_format_mtree.c
View File

@ -404,10 +404,13 @@ read_mtree(struct archive_read *a, struct mtree *mtree)
len = readline(a, mtree, &p, 256);
if (len == 0) {
mtree->this_entry = mtree->entries;
free_options(global);
return (ARCHIVE_OK);
}
if (len < 0)
if (len < 0) {
free_options(global);
return (len);
}
/* Leading whitespace is never significant, ignore it. */
while (*p == ' ' || *p == '\t') {
++p;
@ -432,13 +435,16 @@ read_mtree(struct archive_read *a, struct mtree *mtree)
} else
break;
if (r != ARCHIVE_OK)
if (r != ARCHIVE_OK) {
free_options(global);
return r;
}
}
archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
"Can't parse line %ju", counter);
return ARCHIVE_FATAL;
free_options(global);
return (ARCHIVE_FATAL);
}
/*