bin/xbps-remove: fix DIR leak in --clean-cache

Duncaen · Duncaen · commit a8d817c6c724 · 2026-02-24T20:32:53.000+01:00
diff --git a/bin/xbps-remove/clean-cache.c b/bin/xbps-remove/clean-cache.c
@@ -176,8 +176,10 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)
 	}
 
 	array = xbps_array_create();
-	if (!array)
+	if (!array) {
+		(void)closedir(dirp);
 		return xbps_error_oom();
+	}
 
 	while ((dp = readdir(dirp)) != NULL) {
 		if ((strcmp(dp->d_name, ".") == 0) ||
@@ -193,6 +195,7 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)
 		}
 		if (!xbps_array_add_cstring(array, dp->d_name)) {
 			xbps_object_release(array);
+			(void)closedir(dirp);
 			return xbps_error_oom();
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -176,8 +176,10 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`array = xbps_array_create();`
`179`		`- if (!array)`
	`179`	`+ if (!array) {`
	`180`	`+ (void)closedir(dirp);`
`180`	`181`	`return xbps_error_oom();`
	`182`	`+ }`
`181`	`183`
`182`	`184`	`while ((dp = readdir(dirp)) != NULL) {`
`183`	`185`	`if ((strcmp(dp->d_name, ".") == 0) \|\|`
`@@ -193,6 +195,7 @@ clean_cachedir(struct xbps_handle *xhp, bool uninstalled, bool drun)`
`193`	`195`	`}`
`194`	`196`	`if (!xbps_array_add_cstring(array, dp->d_name)) {`
`195`	`197`	`xbps_object_release(array);`
	`198`	`+ (void)closedir(dirp);`
`196`	`199`	`return xbps_error_oom();`
`197`	`200`	`}`
`198`	`201`	`}`