db/update/Walk: fix crash when music_directory is not a directory

Add a runtime sanity check to avoid the assertion failure. Closes https://github.com/MusicPlayerDaemon/MPD/issues/660

db/update/Walk: fix crash when music_directory is not a directory
23d08820 · Max Kellermann · b9b906ab · 23d08820 · 23d08820
Commit 23d08820 authored Oct 07, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

NEWS NEWS +2 -0

Walk.cxx src/db/update/Walk.cxx +6 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.16 (not yet released)
+* update
+  - fix crash when music_directory is not a directory

 ver 0.21.15 (2019/09/25)
 * decoder

--- a/src/db/update/Walk.cxx
+++ b/src/db/update/Walk.cxx
@@ -493,6 +493,12 @@ UpdateWalk::Walk(Directory &root, const char *path, bool discard) noexcept
 		if (!GetInfo(storage, "", info))
 			return false;

+		if (!info.IsDirectory()) {
+			FormatError(update_domain, "Not a directory: %s",
+				    storage.MapUTF8("").c_str());
+			return false;
+		}
+
 		ExcludeList exclude_list;

 		UpdateDirectory(root, exclude_list, info);