FileCommands: fix deadlock in "albumart" command

Must lock the mutex before calling any of the unprotected InputStream methods. Closes #462

FileCommands: fix deadlock in "albumart" command
05db6934 · Max Kellermann · 02c68c5c · 05db6934 · 05db6934
Commit 05db6934 authored Jan 21, 2019 by Max Kellermann
Show 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.21.5 (not yet released)
+* protocol
+  - fix deadlock in "albumart" command
 * tags
  - ape: map "Album Artist"
 * output

--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -285,8 +285,11 @@ read_stream_art(Response &r, const char *uri, size_t offset)
 	uint8_t buffer[CHUNK_SIZE];
 	size_t read_size;

+	{
+		const std::lock_guard<Mutex> protect(mutex);
 		is->Seek(offset);
 		read_size = is->Read(&buffer, CHUNK_SIZE);
+	}

 	r.Format("size: %" PRIoffset "\n"
 			 "binary: %u\n",