From cfe024ea138d3c9f72ac2875c22e75cc9517b52a Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Sun, 15 Aug 2021 12:46:22 +0100 Subject: [PATCH] command/file: return directory_uri if real_uri is unset Prevent a segfault when accessing album art. Fix #1224 #1225 --- NEWS | 2 ++ src/command/FileCommands.cxx | 3 +++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index e918c8150..a22eb7d63 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.22.11 (not yet released) +* protocol + - fix "albumart" crash ver 0.22.10 (2021/08/06) * protocol diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx index 1a2b3b8c4..e6ff5672d 100644 --- 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