From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 19 Apr 2021 20:50:32 +0000 (+0200)
Subject: mount-util: make umount_and_rmdir_and_freep() cleanup handler deal with NULL
X-Git-Tag: v249-rc1~387
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d686e6b0b12ffe9a1104ac23fee97c0de8a0730;p=thirdparty%2Fsystemd.git

mount-util: make umount_and_rmdir_and_freep() cleanup handler deal with NULL
---

diff --git a/src/shared/mount-util.h b/src/shared/mount-util.h
index 71838976860..6469181d1cf 100644
--- a/src/shared/mount-util.h
+++ b/src/shared/mount-util.h
@@ -93,8 +93,10 @@ int mode_to_inaccessible_node(const char *runtime_dir, mode_t mode, char **dest)
 /* Useful for usage with _cleanup_(), unmounts, removes a directory and frees the pointer */
 static inline char* umount_and_rmdir_and_free(char *p) {
         PROTECT_ERRNO;
-        (void) umount_recursive(p, 0);
-        (void) rmdir(p);
+        if (p) {
+                (void) umount_recursive(p, 0);
+                (void) rmdir(p);
+        }
         return mfree(p);
 }
 DEFINE_TRIVIAL_CLEANUP_FUNC(char*, umount_and_rmdir_and_free);