emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/transaction_files.c: cleanup memory

Browse Source
This commit is contained in:
Duncan Overbruck 2020-02-22 15:26:25 +01:00 committed by Juan RP
parent 64f96ec940
commit c3830670f8
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/transaction_files.c
View File

@ -46,7 +46,7 @@ struct item {
struct { struct {
const char *pkgname; const char *pkgname;
const char *pkgver; const char *pkgver;
const char *sha256; char *sha256;
const char *target; const char *target;
uint64_t size; uint64_t size;
enum type type; enum type type;
@ -304,7 +304,7 @@ collect_obsoletes(struct xbps_handle *xhp)
/* /*
* Skip unexisting files and keep files with hash mismatch. * Skip unexisting files and keep files with hash mismatch.
*/ */
if (item->old.sha256) { if (item->old.sha256 != NULL) {
rv = xbps_file_sha256_check(item->file, item->old.sha256); rv = xbps_file_sha256_check(item->file, item->old.sha256);
switch (rv) { switch (rv) {
case 0: case 0:
@ -504,8 +504,8 @@ collect_file(struct xbps_handle *xhp, const char *file, size_t size,
return 0; return 0;
add: add:
if (removefile) { if (removefile) {
item->old.pkgname = strdup(pkgname); item->old.pkgname = pkgname;
item->old.pkgver = strdup(pkgver); item->old.pkgver = pkgver;
item->old.type = type; item->old.type = type;
item->old.size = size; item->old.size = size;
item->old.index = idx; item->old.index = idx;
@ -516,8 +516,8 @@ add:
if (sha256) if (sha256)
item->old.sha256 = strdup(sha256); item->old.sha256 = strdup(sha256);
} else { } else {
item->new.pkgname = strdup(pkgname); item->new.pkgname = pkgname;
item->new.pkgver = strdup(pkgver); item->new.pkgver = pkgver;
item->new.type = type; item->new.type = type;
item->new.size = size; item->new.size = size;
item->new.index = idx; item->new.index = idx;
@ -745,6 +745,21 @@ pathcmp(const void *l1, const void *l2)
return (a->len < b->len) - (b->len < a->len); return (a->len < b->len) - (b->len < a->len);
} }
static void
cleanup(void)
{
struct item *item, *itmp;
HASH_ITER(hh, hashtab, item, itmp) {
HASH_DEL(hashtab, item);
free(item->file);
free(item->old.sha256);
free(item->new.sha256);
free(item);
}
free(items);
}
int HIDDEN int HIDDEN
xbps_transaction_files(struct xbps_handle *xhp, xbps_object_iterator_t iter) xbps_transaction_files(struct xbps_handle *xhp, xbps_object_iterator_t iter)
{ {
@ -841,5 +856,7 @@ out:
if (rv != 0) if (rv != 0)
return rv; return rv;
return collect_obsoletes(xhp); rv = collect_obsoletes(xhp);
cleanup();
return rv;
} }