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

output/Source: reset current_chunk in Open() 

If the output is already open, the `current_chunk` pointer may be
bogus and out of sync with `SharedPipeConsumer::chunk`, leading to an
assertion failure in `SharedPipeConsumer::Consume()`.

Fixes #411
This commit is contained in:
Max Kellermann 2018-11-07 00:17:48 +01:00
parent 451b142e3a
commit b1fe105904
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -2,6 +2,8 @@ ver 0.21.2 (not yet released)
* decoder * decoder
- ffmpeg: require FFmpeg 3.1 or later - ffmpeg: require FFmpeg 3.1 or later
- ffmpeg: fix broken sound with certain codecs - ffmpeg: fix broken sound with certain codecs
* output
- httpd: fix crash with "always_on"
ver 0.21.1 (2018/11/04) ver 0.21.1 (2018/11/04)
* protocol * protocol

4
src/output/Source.cxx
View File

@ -41,8 +41,10 @@ AudioOutputSource::Open(const AudioFormat audio_format, const MusicPipe &_pipe,
{ {
assert(audio_format.IsValid()); assert(audio_format.IsValid());
if (!IsOpen() || &_pipe != &pipe.GetPipe()) if (!IsOpen() || &_pipe != &pipe.GetPipe()) {
current_chunk = nullptr;
pipe.Init(_pipe); pipe.Init(_pipe);
}
/* (re)open the filter */ /* (re)open the filter */