archive/iso9660: skip empty filenames

Aparently, libcdio sometimes returns empty filenames, causing MPD crashes. This shouldn't really happen, and I consider this a libcdio bug - but if it happens, people blame MPD, so let's add a check. Closes https://github.com/MusicPlayerDaemon/MPD/issues/776

archive/iso9660: skip empty filenames
8d34a1cf · Max Kellermann · 73a1f078 · 8d34a1cf · 8d34a1cf
Commit 8d34a1cf authored Mar 07, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

NEWS NEWS +2 -0

Iso9660ArchivePlugin.cxx src/archive/plugins/Iso9660ArchivePlugin.cxx +4 -1

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.21 (not yet released)
+* archive
+  - iso9660: skip empty file names to work around libcdio bug
 * decoder
  - gme: ignore empty tags
 * output

--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
@@ -28,6 +28,7 @@
 #include "input/InputStream.hxx"
 #include "fs/Path.hxx"
 #include "util/RuntimeError.hxx"
+#include "util/StringCompare.hxx"

 #include <cdio/iso9660.h>

@@ -93,7 +94,9 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity,
 		auto *statbuf = (iso9660_stat_t *)
 			_cdio_list_node_data(entnode);
 		const char *filename = statbuf->filename;
-		if (PathTraitsUTF8::IsSpecialFilename(filename))
+		if (StringIsEmpty(filename) ||
+		    PathTraitsUTF8::IsSpecialFilename(filename))
+			/* skip empty names (libcdio bug?) */
 			/* skip special names like "." and ".." */
 			continue;