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

output/Source: reset current_chunk in Open()
b1fe1059 · Max Kellermann · 451b142e · b1fe1059 · b1fe1059
Commit b1fe1059 authored Nov 07, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

NEWS NEWS +2 -0

Source.cxx src/output/Source.cxx +3 -1

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

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