path-util: fix off by one issue to detect slash at the end in path_extend()

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 28b2c66b6efdb5549cc500cd8121ebca1f768933..08dace775dcd176af60a51e35461d0e680547cd5 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -597,7 +597,7 @@ char* path_extend_internal(char **x, ...) {
                 *x = nx;
 
         if (old_sz > 0)
-                slash = nx[old_sz] == '/';
+                slash = nx[old_sz-1] == '/';
         else {
                 nx[old_sz] = 0;
                 slash = true; /* no need to generate a slash anymore */

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 8091a301e38496c6e6ed2fee8549c0685cbe379a..c93a21a4754754b941214bd0c8e5424903017d5d 100644 (file)
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -397,8 +397,14 @@ static void test_path_extend(void) {
 
         assert_se(path_extend(&p, "/foo") == p);
         assert_se(streq(p, "foo/foo"));
-        assert_se(path_extend(&p, "waaaah/wahhh/") == p);
-        assert_se(streq(p, "foo/foo/waaaah/wahhh/"));
+        assert_se(path_extend(&p, "/waaaah/wahhh//") == p);
+        assert_se(streq(p, "foo/foo/waaaah/wahhh//")); /* path_extend() does not drop redundant slashes */
+        assert_se(path_extend(&p, "/aaa/bbb/") == p);
+        assert_se(streq(p, "foo/foo/waaaah/wahhh///aaa/bbb/")); /* but not add an extra slash */
+
+        assert_se(free_and_strdup(&p, "/") >= 0);
+        assert_se(path_extend(&p, "foo") == p);
+        assert_se(streq(p, "/foo"));
 }
 
 static void test_fsck_exists(void) {