command/file: return directory_uri if real_uri is unset

Prevent a segfault when accessing album art. Fix #1224 #1225

command/file: return directory_uri if real_uri is unset
cfe024ea · Samir Benmendil · Max Kellermann · 993d8512 · cfe024ea · cfe024ea
Commit cfe024ea authored Aug 15, 2021 by Samir Benmendil Committed by Max Kellermann Aug 17, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

NEWS NEWS +2 -0

FileCommands.cxx src/command/FileCommands.cxx +3 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.22.11 (not yet released)
+* protocol
+  - fix "albumart" crash

 ver 0.22.10 (2021/08/06)
 * protocol

--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -267,6 +267,9 @@ try {

 	AtScopeExit(db, song) { db->ReturnSong(song); };

+	if (song->real_uri == nullptr)
+		return directory_uri;
+
 	const char *real_uri = song->real_uri;

 	/* this is a simplification which is just enough for CUE