Merge pull request #10438 from poettering/path-is-valid

be a bit more carful when processing transient socket paths via the bus

src/basic/list.h

@@ -38,9 +38,9 @@
 /* Append an item to the list */
 #define LIST_APPEND(name,head,item)                                     \
         do {                                                            \
-                typeof(*(head)) *_tail;                                 \
-                LIST_FIND_TAIL(name,head,_tail);                        \
-                LIST_INSERT_AFTER(name,head,_tail,item);                \
+                typeof(*(head)) **_hhead = &(head), *_tail;             \
+                LIST_FIND_TAIL(name, *_hhead, _tail);                   \
+                LIST_INSERT_AFTER(name, *_hhead, _tail, item);          \
         } while (false)
 
 /* Remove an item from the list */

src/basic/path-util.c

@@ -779,7 +779,18 @@ bool filename_is_valid(const char *p) {
         if (*e != 0)
                 return false;
 
-        if (e - p > FILENAME_MAX)
+        if (e - p > FILENAME_MAX) /* FILENAME_MAX is counted *without* the trailing NUL byte */
+                return false;
+
+        return true;
+}
+
+bool path_is_valid(const char *p) {
+
+        if (isempty(p))
+                return false;
+
+        if (strlen(p) >= PATH_MAX) /* PATH_MAX is counted *with* the trailing NUL byte */
                 return false;
 
         return true;
@@ -787,7 +798,7 @@ bool filename_is_valid(const char *p) {
 
 bool path_is_normalized(const char *p) {
 
-        if (isempty(p))
+        if (!path_is_valid(p))
                 return false;
 
         if (dot_or_dot_dot(p))
@@ -796,9 +807,6 @@ bool path_is_normalized(const char *p) {
         if (startswith(p, "../") || endswith(p, "/..") || strstr(p, "/../"))
                 return false;
 
-        if (strlen(p)+1 > PATH_MAX)
-                return false;
-
         if (startswith(p, "./") || endswith(p, "/.") || strstr(p, "/./"))
                 return false;
 

src/basic/path-util.h

@@ -134,6 +134,7 @@ char* dirname_malloc(const char *path);
 const char *last_path_component(const char *path);
 
 bool filename_is_valid(const char *p) _pure_;
+bool path_is_valid(const char *p) _pure_;
 bool path_is_normalized(const char *p) _pure_;
 
 char *file_in_same_dir(const char *path, const char *filename);