Merge 0e54562082 into b7eefa1996

cgroup-util: fix memory leak on error
CID#1565824 Follow-up for f6793bbcf0
2024-11-21 16:12:17 +01:00 · 2024-11-21 14:02:34 +09:00
1 changed files with 2 additions and 2 deletions
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@ -799,7 +799,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **ret_path) {
                                continue;
                }

-                char *path = strdup(e + 1);
+                _cleanup_free_ char *path = strdup(e + 1);
                if (!path)
                        return -ENOMEM;

@ -812,7 +812,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **ret_path) {
                if (e)
                        *e = 0;

-                *ret_path = path;
+                *ret_path = TAKE_PTR(path);
                return 0;
        }
 }
Author	SHA1	Message	Date
Zbigniew Jędrzejewski-Szmek	e5a91b3e4a	Merge `0e54562082` into `b7eefa1996`	2024-11-21 16:12:17 +01:00
Luca Boccassi	b7eefa1996	cgroup-util: fix memory leak on error CID#1565824 Follow-up for `f6793bbcf0`	2024-11-21 14:02:34 +09:00