Merge pull request #6311 from keszybz/memleak

Fix trivial memleak in sd-login code
2017-07-09 17:58:52 +02:00
parent db6aedab92 964806347b
commit df6d1a29b8
2 changed files with 6 additions and 3 deletions
@@ -878,7 +878,8 @@ _public_ int sd_get_uids(uid_t **users) {
 }

 _public_ int sd_get_machine_names(char ***machines) {
-        char **l, **a, **b;
+        _cleanup_strv_free_ char **l = NULL;
+        char **a, **b;
        int r;

        r = get_files_in_directory("/run/systemd/machines/", &l);
@@ -907,8 +908,10 @@ _public_ int sd_get_machine_names(char ***machines) {
                *b = NULL;
        }

-        if (machines)
+        if (machines) {
                *machines = l;
+                l = NULL;
+        }
        return r;
 }