From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 2 Jun 2023 09:00:48 +0000 (+0200)
Subject: chase: Allow passing NULL as the empty path to chaseat()
X-Git-Tag: v254-rc1~269^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c8f449cc84c5c3f583841360271d927d5e384fc;p=thirdparty%2Fsystemd.git

chase: Allow passing NULL as the empty path to chaseat()

Per coding style, we should accept NULL as the empty path.
---

diff --git a/src/basic/chase.c b/src/basic/chase.c
index 600e2b9d33c..5475e8f70d7 100644
--- a/src/basic/chase.c
+++ b/src/basic/chase.c
@@ -81,7 +81,6 @@ int chaseat(int dir_fd, const char *path, ChaseFlags flags, char **ret_path, int
         const char *todo;
         int r;
 
-        assert(path);
         assert(!FLAGS_SET(flags, CHASE_PREFIX_ROOT));
         assert(!FLAGS_SET(flags, CHASE_STEP|CHASE_EXTRACT_FILENAME));
         assert(!FLAGS_SET(flags, CHASE_TRAIL_SLASH|CHASE_EXTRACT_FILENAME));
diff --git a/src/test/test-chase.c b/src/test/test-chase.c
index 5bbda2007be..c62a14a777a 100644
--- a/src/test/test-chase.c
+++ b/src/test/test-chase.c
@@ -570,6 +570,10 @@ TEST(chaseat) {
         assert_se(streq(result, "."));
         result = mfree(result);
 
+        assert_se(chaseat(tfd, NULL, CHASE_PARENT|CHASE_AT_RESOLVE_IN_ROOT|CHASE_EXTRACT_FILENAME, &result, NULL) >= 0);
+        assert_se(streq(result, "."));
+        result = mfree(result);
+
         /* Test chase_and_openat() */
 
         fd = chase_and_openat(tfd, "o/p/e/n/f/i/l/e", CHASE_MKDIR_0755, O_CREAT|O_EXCL|O_CLOEXEC, NULL);