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

xbps_repository_find_pkg_deps: do not recurse more than MAX_DEPTH times, return ELOOP.

Browse Source
This commit is contained in:
Juan RP 2011-01-28 12:12:47 +01:00
parent f7f3cfcb9c
commit af5d3a0653
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/repository_finddeps.c
View File

@ -182,21 +182,26 @@ out:
return rv; return rv;
} }
#define MAX_DEPTH 512
static int static int
find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
prop_array_t mrdeps, /* missing rundeps array */ prop_array_t mrdeps, /* missing rundeps array */
const char *originpkgn, /* origin pkgname */ prop_array_t pkg_rdeps_array, /* current pkg rundeps array */
prop_array_t pkg_rdeps_array) /* current pkg rundeps array */ size_t depth) /* max recursion depth */
{ {
prop_dictionary_t curpkgd, tmpd; prop_dictionary_t curpkgd, tmpd;
prop_array_t curpkg_rdeps; prop_array_t curpkgrdeps;
prop_object_t obj; prop_object_t obj;
prop_object_iterator_t iter; prop_object_iterator_t iter;
pkg_state_t state = 0; pkg_state_t state;
const char *reqpkg, *pkgver_q, *repopkgver; const char *reqpkg, *pkgver_q, *repopkgver;
char *pkgname; char *pkgname;
int rv = 0; int rv = 0;
if (depth >= MAX_DEPTH)
return ELOOP;
iter = prop_array_iterator(pkg_rdeps_array); iter = prop_array_iterator(pkg_rdeps_array);
if (iter == NULL) if (iter == NULL)
return ENOMEM; return ENOMEM;
@ -212,12 +217,12 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
rv = EINVAL; rv = EINVAL;
break; break;
} }
if (originpkgn) if (depth < 1)
xbps_dbg_printf("'%s' requires dependency '%s' " xbps_dbg_printf(" [direct] Requires "
"[direct]: ", originpkgn, reqpkg); "dependency '%s' ", reqpkg);
else else
xbps_dbg_printf(" Requires dependency '%s' " xbps_dbg_printf(" [indirect] Requires "
"[indirect]: ", reqpkg); "dependency '%s' ", reqpkg);
/* /*
* Check if package is already added in the * Check if package is already added in the
@ -365,19 +370,18 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
/* /*
* If package doesn't have rundeps, pass to the next one. * If package doesn't have rundeps, pass to the next one.
*/ */
curpkg_rdeps = prop_dictionary_get(curpkgd, "run_depends"); curpkgrdeps = prop_dictionary_get(curpkgd, "run_depends");
if (curpkg_rdeps == NULL) { if (curpkgrdeps == NULL) {
prop_object_release(curpkgd); prop_object_release(curpkgd);
continue; continue;
} }
prop_object_release(curpkgd); prop_object_release(curpkgd);
/* /*
* Iterate on required pkg to find more deps. * Recursively find rundeps for current pkg dictionary.
*/ */
xbps_dbg_printf("%sFinding dependencies for '%s' [%s]:\n", xbps_dbg_printf("%s[%sdirect] Finding dependencies for '%s':\n",
originpkgn ? "" : " ", reqpkg, depth < 1 ? "" : " ", depth < 1 ? "" : "in", reqpkg);
originpkgn ? "direct" : "indirect"); rv = find_repo_deps(transd, mrdeps, curpkgrdeps, depth++);
rv = find_repo_deps(transd, mrdeps, NULL, curpkg_rdeps);
if (rv != 0) { if (rv != 0) {
xbps_dbg_printf("Error checking %s for rundeps: %s\n", xbps_dbg_printf("Error checking %s for rundeps: %s\n",
reqpkg, strerror(rv)); reqpkg, strerror(rv));
@ -385,6 +389,7 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
} }
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
depth--;
return rv; return rv;
} }
@ -395,7 +400,7 @@ xbps_repository_find_pkg_deps(prop_dictionary_t transd,
prop_dictionary_t repo_pkgd) prop_dictionary_t repo_pkgd)
{ {
prop_array_t pkg_rdeps; prop_array_t pkg_rdeps;
const char *pkgname, *pkgver; const char *pkgver;
int rv = 0; int rv = 0;
assert(transd != NULL); assert(transd != NULL);
@ -406,14 +411,13 @@ xbps_repository_find_pkg_deps(prop_dictionary_t transd,
if (pkg_rdeps == NULL) if (pkg_rdeps == NULL)
return 0; return 0;
prop_dictionary_get_cstring_nocopy(repo_pkgd, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(repo_pkgd, "pkgver", &pkgver); prop_dictionary_get_cstring_nocopy(repo_pkgd, "pkgver", &pkgver);
xbps_dbg_printf("Finding required dependencies for '%s':\n", pkgver); xbps_dbg_printf("Finding required dependencies for '%s':\n", pkgver);
/* /*
* This will find direct and indirect deps, if any of them is not * This will find direct and indirect deps, if any of them is not
* there it will be added into the missing_deps array. * there it will be added into the missing_deps array.
*/ */
if ((rv = find_repo_deps(transd, mdeps, pkgname, pkg_rdeps)) != 0) { if ((rv = find_repo_deps(transd, mdeps, pkg_rdeps, 0)) != 0) {
xbps_dbg_printf("Error '%s' while checking rundeps!\n", xbps_dbg_printf("Error '%s' while checking rundeps!\n",
strerror(rv)); strerror(rv));
} }