Merge branch 'v0.20.x'

2017-12-26 20:03:18 +01:00
parent daeb7ae949 eee10ad2ed
commit cd38aa3b2a
2 changed files with 3 additions and 1 deletions
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -270,6 +270,7 @@ CurlInputStream::OnData(ConstBuffer<void> data)
 void
 CurlInputStream::OnEnd()
 {
+	const std::lock_guard<Mutex> protect(mutex);
 	cond.broadcast();

 	AsyncInputStream::SetClosed();
@@ -278,6 +279,7 @@ CurlInputStream::OnEnd()
 void
 CurlInputStream::OnError(std::exception_ptr e) noexcept
 {
+	const std::lock_guard<Mutex> protect(mutex);
 	postponed_exception = std::move(e);

 	if (IsSeekPending())