ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

queue: ensure pkgconf_queue_apply alies cleanesup the world set

Dylan Baker 2022-07-27 15:13:55 -07:00
parent 09c224dd7d
commit 75a5fe0757
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libpkgconf/queue.c
View File

@ -272,24 +272,28 @@ pkgconf_queue_apply(pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_queu
.realname = "virtual world package", .realname = "virtual world package",
.flags = PKGCONF_PKG_PROPF_STATIC | PKGCONF_PKG_PROPF_VIRTUAL, .flags = PKGCONF_PKG_PROPF_STATIC | PKGCONF_PKG_PROPF_VIRTUAL,
}; };
bool ret = false;
/* if maxdepth is one, then we will not traverse deeper than our virtual package. */ /* if maxdepth is one, then we will not traverse deeper than our virtual package. */
if (!maxdepth) if (!maxdepth)
maxdepth = -1; maxdepth = -1;
if (pkgconf_queue_verify(client, &world, list, maxdepth) != PKGCONF_PKG_ERRF_OK) if (pkgconf_queue_verify(client, &world, list, maxdepth) != PKGCONF_PKG_ERRF_OK)
return false; {
goto out;
}
/* the world dependency set is flattened after it is returned from pkgconf_queue_verify */ /* the world dependency set is flattened after it is returned from pkgconf_queue_verify */
if (!func(client, &world, data, maxdepth)) if (!func(client, &world, data, maxdepth))
{ {
pkgconf_pkg_free(client, &world); goto out;
return false;
} }
pkgconf_pkg_free(client, &world);
return true; ret = true;
out:
pkgconf_pkg_free(client, &world);
return ret;
} }
/* /*