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

main: fix refcount violation exposed by incremental dependency solver

pull/164/head
William Pitcock 2017-12-11 18:23:14 -06:00
parent 7b1fac4c99
commit 1c9880a03b
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
main.c
View File

@ -222,18 +222,16 @@ static bool
apply_provides(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth) apply_provides(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth)
{ {
pkgconf_node_t *iter; pkgconf_node_t *iter;
(void) client;
(void) unused; (void) unused;
(void) maxdepth; (void) maxdepth;
PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter) PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter)
{ {
pkgconf_pkg_t *pkg;
pkgconf_dependency_t *dep = iter->data; pkgconf_dependency_t *dep = iter->data;
pkgconf_pkg_t *pkg = dep->match;
pkg = pkgconf_pkg_verify_dependency(client, dep, NULL);
print_provides(pkg); print_provides(pkg);
pkgconf_pkg_free(&pkg_client, pkg);
} }
return true; return true;
@ -278,19 +276,17 @@ static bool
apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth) apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth)
{ {
pkgconf_node_t *iter; pkgconf_node_t *iter;
(void) client;
(void) unused; (void) unused;
(void) maxdepth; (void) maxdepth;
PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter) PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter)
{ {
pkgconf_pkg_t *pkg;
pkgconf_dependency_t *dep = iter->data; pkgconf_dependency_t *dep = iter->data;
pkgconf_pkg_t *pkg = dep->match;
pkg = pkgconf_pkg_verify_dependency(client, dep, NULL);
if (pkg->version != NULL) if (pkg->version != NULL)
printf("%s\n", pkg->version); printf("%s\n", pkg->version);
pkgconf_pkg_free(&pkg_client, pkg);
} }
return true; return true;
@ -300,18 +296,16 @@ static bool
apply_variables(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth) apply_variables(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth)
{ {
pkgconf_node_t *iter; pkgconf_node_t *iter;
(void) client;
(void) unused; (void) unused;
(void) maxdepth; (void) maxdepth;
PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter) PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter)
{ {
pkgconf_pkg_t *pkg;
pkgconf_dependency_t *dep = iter->data; pkgconf_dependency_t *dep = iter->data;
pkgconf_pkg_t *pkg = dep->match;
pkg = pkgconf_pkg_verify_dependency(client, dep, NULL);
print_variables(pkg); print_variables(pkg);
pkgconf_pkg_free(&pkg_client, pkg);
} }
return true; return true;
@ -321,21 +315,18 @@ static bool
apply_path(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth) apply_path(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth)
{ {
pkgconf_node_t *iter; pkgconf_node_t *iter;
(void) client;
(void) unused; (void) unused;
(void) maxdepth; (void) maxdepth;
PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter) PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter)
{ {
pkgconf_pkg_t *pkg;
pkgconf_dependency_t *dep = iter->data; pkgconf_dependency_t *dep = iter->data;
pkgconf_pkg_t *pkg = dep->match;
pkg = pkgconf_pkg_verify_dependency(client, dep, NULL);
/* a module entry with no filename is either virtual, static (builtin) or synthesized. */ /* a module entry with no filename is either virtual, static (builtin) or synthesized. */
if (pkg->filename != NULL) if (pkg->filename != NULL)
printf("%s\n", pkg->filename); printf("%s\n", pkg->filename);
pkgconf_pkg_free(&pkg_client, pkg);
} }
return true; return true;
@ -359,17 +350,13 @@ apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, i
PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter) PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter)
{ {
pkgconf_pkg_t *pkg;
pkgconf_dependency_t *dep = iter->data; pkgconf_dependency_t *dep = iter->data;
pkgconf_pkg_t *pkg = dep->match;
pkg = pkgconf_pkg_verify_dependency(client, dep, NULL);
if (iter->prev != NULL) if (iter->prev != NULL)
printf(" "); printf(" ");
print_variable(client, pkg, variable); print_variable(client, pkg, variable);
pkgconf_pkg_free(&pkg_client, pkg);
} }
printf("\n"); printf("\n");
@ -490,18 +477,16 @@ static bool
apply_requires(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth) apply_requires(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth)
{ {
pkgconf_node_t *iter; pkgconf_node_t *iter;
(void) client;
(void) unused; (void) unused;
(void) maxdepth; (void) maxdepth;
PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter) PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter)
{ {
pkgconf_pkg_t *pkg;
pkgconf_dependency_t *dep = iter->data; pkgconf_dependency_t *dep = iter->data;
pkgconf_pkg_t *pkg = dep->match;
pkg = pkgconf_pkg_verify_dependency(client, dep, NULL);
print_requires(pkg); print_requires(pkg);
pkgconf_pkg_free(&pkg_client, pkg);
} }
return true; return true;
@ -511,18 +496,16 @@ static bool
apply_requires_private(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth) apply_requires_private(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int maxdepth)
{ {
pkgconf_node_t *iter; pkgconf_node_t *iter;
(void) client;
(void) unused; (void) unused;
(void) maxdepth; (void) maxdepth;
PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter) PKGCONF_FOREACH_LIST_ENTRY(world->requires.head, iter)
{ {
pkgconf_pkg_t *pkg;
pkgconf_dependency_t *dep = iter->data; pkgconf_dependency_t *dep = iter->data;
pkgconf_pkg_t *pkg = dep->match;
pkg = pkgconf_pkg_verify_dependency(client, dep, NULL);
print_requires_private(pkg); print_requires_private(pkg);
pkgconf_pkg_free(&pkg_client, pkg);
} }
return true; return true;
} }