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

input/buffering: destruct our input while mutex is unlocked

Browse Source
This commit is contained in:
Max Kellermann 2019-05-16 22:38:37 +02:00
parent 1acb9bcedb
commit a5c09f4ddb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/input/BufferingInputStream.cxx
View File

@ -196,7 +196,6 @@ BufferingInputStream::RunThread() noexcept
size_t new_offset = FindFirstHole(); size_t new_offset = FindFirstHole();
if (new_offset == INVALID_OFFSET) { if (new_offset == INVALID_OFFSET) {
/* the file has been read completely */ /* the file has been read completely */
input.reset();
break; break;
} }
@ -251,4 +250,14 @@ BufferingInputStream::RunThread() noexcept
} else } else
wake_cond.wait(lock); wake_cond.wait(lock);
} }
/* clear the "input" attribute while holding the mutex */
auto _input = std::move(input);
/* the mutex must be unlocked while an InputStream can be
destructed */
lock.unlock();
/* and now actually destruct the InputStream */
_input.reset();
} }