From 4d686e6b0b12ffe9a1104ac23fee97c0de8a0730 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 19 Apr 2021 22:50:32 +0200 Subject: [PATCH] mount-util: make umount_and_rmdir_and_freep() cleanup handler deal with NULL --- src/shared/mount-util.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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); -- 2.47.3