Skip to content

M
mpd
Commit 16a99804 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

db/update/Archive: move check to IsAcceptableFilename()

parent 75a39ed2
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
src/db/update/Archive.cxx
View file @ 16a99804
...@@ -51,6 +51,13 @@ LockFindSong(Directory &directory, std::string_view name) noexcept ...@@ -51,6 +51,13 @@ LockFindSong(Directory &directory, std::string_view name) noexcept
return directory.FindSong(name); return directory.FindSong(name);
} }
[[gnu::pure]]
static bool
IsAcceptableFilename(std::string_view name) noexcept
{
return !name.empty();
}
void void
UpdateWalk::UpdateArchiveTree(ArchiveFile &archive, Directory &directory, UpdateWalk::UpdateArchiveTree(ArchiveFile &archive, Directory &directory,
const char *name) noexcept const char *name) noexcept
...@@ -65,7 +72,7 @@ UpdateWalk::UpdateArchiveTree(ArchiveFile &archive, Directory &directory, ...@@ -65,7 +72,7 @@ UpdateWalk::UpdateArchiveTree(ArchiveFile &archive, Directory &directory,
//create directories first //create directories first
UpdateArchiveTree(archive, *subdir, tmp + 1); UpdateArchiveTree(archive, *subdir, tmp + 1);
} else { } else {
if (StringIsEmpty(name)) if (!IsAcceptableFilename(name))
return; return;
//add file //add file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment