diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-28 23:32:57 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-07 09:43:58 +0100 |
| commit | e972338e3596036d5d1f3ef214c465fa8a4a8504 (patch) | |
| tree | f6bbd5d56e9e52002e5c19227e782311019abbfb | |
| parent | 90294e31a199b457bba77da2f73183d2d154faf4 (diff) | |
| download | ffmpeg-e972338e3596036d5d1f3ef214c465fa8a4a8504.tar.gz | |
asfdec: Check the return value of asf_read_stream_properties
This makes sure errors in setting stream parameters are passed
on to the caller. This avoids successfully opening files while
some parameters aren't filled in properly.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit cc41167aede4c101ad17eeffa8f39bb6c23d3dad)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit fc4d11ec9b4c9710e2dac012d4ed0e7d08c6df7d)
| -rw-r--r-- | libavformat/asfdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 3b487888ba..a6affbbe53 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -622,7 +622,9 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) if (ret < 0) return ret; } else if (!ff_guidcmp(&g, &ff_asf_stream_header)) { - asf_read_stream_properties(s, gsize); + int ret = asf_read_stream_properties(s, gsize); + if (ret < 0) + return ret; } else if (!ff_guidcmp(&g, &ff_asf_comment_header)) { asf_read_content_desc(s, gsize); } else if (!ff_guidcmp(&g, &ff_asf_language_guid)) { |