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

decoder/Thread: decoder_input_stream_open() returns std::unique_ptr<InputStream> 

Fixes memory leak after InputStream::Check() failure.
This commit is contained in:
Max Kellermann 2015-12-31 13:31:12 +01:00
parent 6c5b8bcf9d
commit e2bc63217a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/decoder/DecoderThread.cxx
View File

@ -55,12 +55,13 @@ static constexpr Domain decoder_thread_domain("decoder_thread");
* @return an InputStream on success or if #DecoderCommand::STOP is * @return an InputStream on success or if #DecoderCommand::STOP is
* received, nullptr on error * received, nullptr on error
*/ */
static InputStream * static std::unique_ptr<InputStream>
decoder_input_stream_open(DecoderControl &dc, const char *uri) decoder_input_stream_open(DecoderControl &dc, const char *uri)
{ {
Error error; Error error;
InputStream *is = InputStream::Open(uri, dc.mutex, dc.cond, error); std::unique_ptr<InputStream> is(InputStream::Open(uri, dc.mutex,
dc.cond, error));
if (is == nullptr) { if (is == nullptr) {
if (error.IsDefined()) if (error.IsDefined())
LogError(error); LogError(error);
@ -89,12 +90,13 @@ decoder_input_stream_open(DecoderControl &dc, const char *uri)
return is; return is;
} }
static InputStream * static std::unique_ptr<InputStream>
decoder_input_stream_open(DecoderControl &dc, Path path) decoder_input_stream_open(DecoderControl &dc, Path path)
{ {
Error error; Error error;
InputStream *is = OpenLocalInputStream(path, dc.mutex, dc.cond, error); std::unique_ptr<InputStream> is(OpenLocalInputStream(path, dc.mutex,
dc.cond, error));
if (is == nullptr) { if (is == nullptr) {
LogError(error); LogError(error);
return nullptr; return nullptr;
@ -261,7 +263,8 @@ decoder_run_stream(Decoder &decoder, const char *uri)
{ {
DecoderControl &dc = decoder.dc; DecoderControl &dc = decoder.dc;
std::unique_ptr<InputStream> input_stream(decoder_input_stream_open(dc, uri)); std::unique_ptr<InputStream> input_stream =
decoder_input_stream_open(dc, uri);
if (input_stream == nullptr) if (input_stream == nullptr)
return false; return false;
@ -307,7 +310,8 @@ TryDecoderFile(Decoder &decoder, Path path_fs, const char *suffix,
const ScopeLock protect(dc.mutex); const ScopeLock protect(dc.mutex);
return decoder_file_decode(plugin, decoder, path_fs); return decoder_file_decode(plugin, decoder, path_fs);
} else if (plugin.stream_decode != nullptr) { } else if (plugin.stream_decode != nullptr) {
std::unique_ptr<InputStream> input_stream(decoder_input_stream_open(dc, path_fs)); std::unique_ptr<InputStream> input_stream =
decoder_input_stream_open(dc, path_fs);
if (input_stream == nullptr) if (input_stream == nullptr)
return false; return false;