lib: partially fix memory leak from xbps_get_pkg_fulldeptree

Author: Duncaen

lib/package_fulldeptree.c

@@ -47,8 +47,8 @@ struct item {
 	UT_hash_handle hh;
 };
 
+// XXX: this shouldn't be a global static...
 static struct item *items = NULL;
-static xbps_array_t result;
 
 static struct item *
 lookupItem(const char *pkgn)
@@ -99,7 +99,7 @@ addDepn(struct item *item, struct item *xitem)
 }
 
 static void
-add_deps_recursive(struct item *item, bool first)
+add_deps_recursive(xbps_array_t result, struct item *item, bool first)
 {
 	struct depn *dep;
 	xbps_string_t str;
@@ -108,7 +108,7 @@ add_deps_recursive(struct item *item, bool first)
 		return;
 
 	for (dep = item->dbase; dep; dep = dep->dnext)
-		add_deps_recursive(dep->item, false);
+		add_deps_recursive(result, dep->item, false);
 
 	if (first)
 		return;
@@ -133,19 +133,23 @@ cleanup(void)
 	}
 }
 
+struct deptree_ctx {
+	struct xbps_handle *xhp;
+	xbps_array_t result;
+	bool rpool;
+};
+
 /*
  * Recursively calculate all dependencies.
  */
 static struct item *
-ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool,
-		size_t depth)
+ordered_depends(struct deptree_ctx *ctx, xbps_dictionary_t pkgd, size_t depth)
 {
 	xbps_array_t rdeps, provides;
 	xbps_string_t str;
 	struct item *item = NULL, *xitem = NULL;
 	const char *pkgver = NULL, *pkgname = NULL;
 
-	assert(xhp);
 	assert(pkgd);
 
 	rdeps = xbps_dictionary_get(pkgd, "run_depends");
@@ -154,7 +158,7 @@ ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool,
 
 	item = lookupItem(pkgname);
 	if (item) {
-		add_deps_recursive(item, depth == 0);
+		add_deps_recursive(ctx->result, item, depth == 0);
 		return item;
 	}
 
@@ -171,12 +175,12 @@ ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool,
 		char curdepname[XBPS_NAME_SIZE];
 
 		xbps_array_get_cstring_nocopy(rdeps, i, &curdep);
-		if (rpool) {
-			if ((curpkgd = xbps_rpool_get_pkg(xhp, curdep)) == NULL)
-				curpkgd = xbps_rpool_get_virtualpkg(xhp, curdep);
+		if (ctx->rpool) {
+			if ((curpkgd = xbps_rpool_get_pkg(ctx->xhp, curdep)) == NULL)
+				curpkgd = xbps_rpool_get_virtualpkg(ctx->xhp, curdep);
 		} else {
-			if ((curpkgd = xbps_pkgdb_get_pkg(xhp, curdep)) == NULL)
-				curpkgd = xbps_pkgdb_get_virtualpkg(xhp, curdep);
+			if ((curpkgd = xbps_pkgdb_get_pkg(ctx->xhp, curdep)) == NULL)
+				curpkgd = xbps_pkgdb_get_virtualpkg(ctx->xhp, curdep);
 			/* Ignore missing local runtime dependencies, because ignorepkg */
 			if (curpkgd == NULL)
 				continue;
@@ -199,10 +203,10 @@ ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool,
 		}
 		xitem = lookupItem(curdepname);
 		if (xitem) {
-			add_deps_recursive(xitem, false);
+			add_deps_recursive(ctx->result, xitem, false);
 			continue;
 		}
-		xitem = ordered_depends(xhp, curpkgd, rpool, depth+1);
+		xitem = ordered_depends(ctx, curpkgd, depth+1);
 		if (xitem == NULL) {
 			/* package depends on missing dependencies */
 			xbps_dbg_printf("%s: missing dependency '%s'\n", pkgver, curdep);
@@ -213,10 +217,10 @@ ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool,
 		addDepn(item, xitem);
 	}
 	/* all deps were processed, add item to head */
-	if (depth > 0 && !xbps_match_string_in_array(result, item->pkgver)) {
+	if (depth > 0 && !xbps_match_string_in_array(ctx->result, item->pkgver)) {
 		str = xbps_string_create_cstring(item->pkgver);
 		assert(str);
-		xbps_array_add_first(result, str);
+		xbps_array_add_first(ctx->result, str);
 		xbps_object_release(str);
 	}
 	return item;
@@ -225,11 +229,12 @@ ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool,
 xbps_array_t HIDDEN
 xbps_get_pkg_fulldeptree(struct xbps_handle *xhp, const char *pkg, bool rpool)
 {
+	struct deptree_ctx ctx = {
+		.xhp = xhp,
+		.rpool = rpool,
+	};
 	xbps_dictionary_t pkgd;
 
-	result = xbps_array_create();
-	assert(result);
-
 	if (rpool) {
 		if (((pkgd = xbps_rpool_get_pkg(xhp, pkg)) == NULL) &&
 		    ((pkgd = xbps_rpool_get_virtualpkg(xhp, pkg)) == NULL))
@@ -239,9 +244,20 @@ xbps_get_pkg_fulldeptree(struct xbps_handle *xhp, const char *pkg, bool rpool)
 		    ((pkgd = xbps_pkgdb_get_virtualpkg(xhp, pkg)) == NULL))
 			return NULL;
 	}
-	if (ordered_depends(xhp, pkgd, rpool, 0) == NULL)
+
+	ctx.result = xbps_array_create();
+	if (!ctx.result) {
+		xbps_error_oom();
 		return NULL;
+	}
+
+	if (ordered_depends(&ctx, pkgd, 0) == NULL)
+		goto err;
 
 	cleanup();
-	return result;
+	return ctx.result;
+err:
+	cleanup();
+	xbps_object_release(ctx.result);
+	return NULL;
 }

lib/package_orphans.c

@@ -160,7 +160,13 @@ xbps_find_pkg_orphans(struct xbps_handle *xhp, xbps_array_t orphans_user)
 		pkgd = xbps_array_get(array, i);
 		xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
 		rdeps = xbps_pkgdb_get_pkg_fulldeptree(xhp, pkgver);
+		if (!rdeps) {
+			// XXX: we should probably abort.
+			xbps_error_printf("failed to get reverse dependencies: %s\n", strerror(errno));
+			continue;
+		}
 		if (xbps_array_count(rdeps) == 0) {
+			xbps_object_release(rdeps);
 			continue;
 		}
 
@@ -199,6 +205,7 @@ xbps_find_pkg_orphans(struct xbps_handle *xhp, xbps_array_t orphans_user)
 				xbps_dbg_printf(" added %s orphan\n", deppkgver);
 			}
 		}
+		xbps_object_release(rdeps);
 	}
 
 	return array;