oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

FileCommands: fix deadlock in "albumart" command 

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

Closes #462
This commit is contained in:
Max Kellermann 2019-01-21 22:16:46 +01:00
parent 02c68c5cdb
commit 05db6934eb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,6 @@
ver 0.21.5 (not yet released) ver 0.21.5 (not yet released)
* protocol
- fix deadlock in "albumart" command
* tags * tags
- ape: map "Album Artist" - ape: map "Album Artist"
* output * output

3
src/command/FileCommands.cxx
View File

@ -285,8 +285,11 @@ read_stream_art(Response &r, const char *uri, size_t offset)
uint8_t buffer[CHUNK_SIZE]; uint8_t buffer[CHUNK_SIZE];
size_t read_size; size_t read_size;
{
const std::lock_guard<Mutex> protect(mutex);
is->Seek(offset); is->Seek(offset);
read_size = is->Read(&buffer, CHUNK_SIZE); read_size = is->Read(&buffer, CHUNK_SIZE);
}
r.Format("size: %" PRIoffset "\n" r.Format("size: %" PRIoffset "\n"
"binary: %u\n", "binary: %u\n",