directory: check the absolute path of a subdirectory while loading

A manipulated database could trigger an assertion failure, because the parent didn't match. Do a proper check if the new directory is within the parent's. This uses FATAL() to bail out, so MPD still dies, but it doesn't crash.

directory: check the absolute path of a subdirectory while loading
702739b8 · Max Kellermann · cbc07646 · 702739b8
Commit 702739b8 authored Oct 09, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

directory_save.c src/directory_save.c +4 -0

No files found.
--- a/src/directory_save.c
+++ b/src/directory_save.c
@@ -84,6 +84,10 @@ directory_load(FILE *fp, struct directory *directory)
 			if (prefixcmp(buffer, DIRECTORY_BEGIN))
 				FATAL("Error reading db at line: %s\n", buffer);
 			name = &(buffer[strlen(DIRECTORY_BEGIN)]);
+			if (prefixcmp(name, directory->path) != 0)
+				FATAL("Wrong path in database: '%s' in '%s'\n",
+				      name, directory->path);
+
 			if ((subdir = db_get_directory(name))) {
 				assert(subdir->parent == directory);
 			} else {