diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-23 22:27:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-23 22:27:48 +0100 |
| commit | 0c00e734ef2b1cac83cf71f331bdb0f6e504de23 (patch) | |
| tree | 6a7ff511ba2de020b91c618624313a55387ff7f9 /libavformat/hlsproto.c | |
| parent | da304c529b65058c0a001b3bbb18e83539a28d71 (diff) | |
| parent | 7915e6741dbe1cf3a8781cead3e68a7666de14f4 (diff) | |
| download | ffmpeg-0c00e734ef2b1cac83cf71f331bdb0f6e504de23.tar.gz | |
Merge commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4'
* commit '7915e6741dbe1cf3a8781cead3e68a7666de14f4':
hlsproto: Properly close avio buffer in case of error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsproto.c')
| -rw-r--r-- | libavformat/hlsproto.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c index 788562aa81..92843df258 100644 --- a/libavformat/hlsproto.c +++ b/libavformat/hlsproto.c @@ -121,8 +121,10 @@ static int parse_playlist(URLContext *h, const char *url) return ret; read_chomp_line(in, line, sizeof(line)); - if (strcmp(line, "#EXTM3U")) - return AVERROR_INVALIDDATA; + if (strcmp(line, "#EXTM3U")) { + ret = AVERROR_INVALIDDATA; + goto fail; + } free_segment_list(s); s->finished = 0; |