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

input/async: check for errors in Seek()

Browse Source 
Fixes a busy loop in BufferingInputStream::RunThreadLocked() because
the method never learns that seeking is ignored, even though the HTTP
stream is already broken and can never be read; nobody cared to check
for errors.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1727
This commit is contained in:
Max Kellermann 2023-01-28 07:41:47 +01:00
parent d2797effa3
commit 541468f0ca
2 changed files with 12 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.23.13 (not yet released) ver 0.23.13 (not yet released)
* input
- curl: fix busy loop after connection failed
ver 0.23.12 (2023/01/17) ver 0.23.12 (2023/01/17)
* input * input

12
src/input/AsyncInputStream.cxx
View File

@ -101,9 +101,17 @@ AsyncInputStream::Seek(std::unique_lock<Mutex> &lock,
assert(IsReady()); assert(IsReady());
assert(seek_state == SeekState::NONE); assert(seek_state == SeekState::NONE);
if (new_offset == offset) if (new_offset == offset) {
/* no-op */ /* no-op, but if the stream is not open anymore (maybe
because it has failed), nothing can be read, so we
should check for errors here instead of pretending
everything's fine */
if (!open)
Check();
return; return;
}
if (!IsSeekable()) if (!IsSeekable())
throw std::runtime_error("Not seekable"); throw std::runtime_error("Not seekable");