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

input/curl: relock mutex in error paths

Browse Source
This commit is contained in:
Max Kellermann 2014-05-21 19:00:47 +02:00
parent 5cec477131
commit 49695d47d3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/input/plugins/CurlInputPlugin.cxx
View File

@ -955,11 +955,14 @@ CurlInputStream::Seek(InputPlugin::offset_type new_offset, int whence,
/* seek to EOF: simulate empty result; avoid /* seek to EOF: simulate empty result; avoid
triggering a "416 Requested Range Not Satisfiable" triggering a "416 Requested Range Not Satisfiable"
response */ response */
mutex.lock();
return true; return true;
} }
if (!InitEasy(error)) if (!InitEasy(error)) {
mutex.lock();
return false; return false;
}
/* send the "Range" header */ /* send the "Range" header */
@ -970,8 +973,10 @@ CurlInputStream::Seek(InputPlugin::offset_type new_offset, int whence,
ready = false; ready = false;
if (!input_curl_easy_add_indirect(this, error)) if (!input_curl_easy_add_indirect(this, error)) {
mutex.lock();
return false; return false;
}
mutex.lock(); mutex.lock();
WaitReady(); WaitReady();