From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 9 Sep 2022 11:55:45 +0000 (+0900)
Subject: sd-device-enumerator: use _cleanup_free_ attribute for safety
X-Git-Tag: v252-rc1~218^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F24609%2Fhead;p=thirdparty%2Fsystemd.git

sd-device-enumerator: use _cleanup_free_ attribute for safety

No functional changes, just improve readability.

Suggested by https://github.com/systemd/systemd/pull/24601#discussion_r966883459.
---

diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
index 5afe9f348f0..a583a37dab2 100644
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@@ -935,13 +935,17 @@ static int enumerator_scan_devices_children(sd_device_enumerator *enumerator) {
                         r = k;
         }
 
-        for (char *p; (p = set_steal_first(stack)); free(p)) {
+        for (;;) {
+                _cleanup_free_ char *p = NULL;
+
+                p = set_steal_first(stack);
+                if (!p)
+                        return r;
+
                 k = parent_crawl_children(enumerator, p, &stack);
                 if (k < 0)
                         r = k;
         }
-
-        return r;
 }
 
 static int enumerator_scan_devices_all(sd_device_enumerator *enumerator) {