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

input/icy: adjust offset at end of stream in Read() 

ProxyInputStream::Read() assigns the `offset` field, which is the
wrong offset because it does not consider Icy metadata removed from
the stream.  Therefore, after every ProxyInputStream::Read() call,
IcyInputStream::Read() needs to override this offset.  This was
missing at the end of the stream, when Read()==0.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1216
This commit is contained in:
Max Kellermann 2021-08-02 16:33:33 +02:00
parent 5355335f19
commit 9fa3984a2f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -3,6 +3,8 @@ ver 0.22.10 (not yet released)
- support "albumart" for virtual tracks in CUE sheets - support "albumart" for virtual tracks in CUE sheets
* database * database
- simple: fix crash bug - simple: fix crash bug
* input
- curl: fix crash bug after stream with Icy metadata was closed by peer
ver 0.22.9 (2021/06/23) ver 0.22.9 (2021/06/23)
* database * database

5
src/input/IcyInputStream.cxx
View File

@ -104,8 +104,11 @@ IcyInputStream::Read(std::unique_lock<Mutex> &lock,
while (true) { while (true) {
size_t nbytes = ProxyInputStream::Read(lock, ptr, read_size); size_t nbytes = ProxyInputStream::Read(lock, ptr, read_size);
if (nbytes == 0) if (nbytes == 0) {
assert(IsEOF());
offset = override_offset;
return 0; return 0;
}
size_t result = parser->ParseInPlace(ptr, nbytes); size_t result = parser->ParseInPlace(ptr, nbytes);
if (result > 0) { if (result > 0) {