diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:47:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-02 14:53:00 +0200 |
| commit | 8aa6ffd8fa648c4e4e4819ed3976aba8ee8540f5 (patch) | |
| tree | 068279d11f58465dd36ff8a0007d1dda97892b02 /libavformat/asfdec.c | |
| parent | 3841e4510b5a466c1d95f3c28e778b870b1da11a (diff) | |
| parent | cc41167aede4c101ad17eeffa8f39bb6c23d3dad (diff) | |
Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'
* commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad':
asfdec: Check the return value of asf_read_stream_properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfdec.c')
| -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 72865c1441..528bcbd5b1 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -754,7 +754,9 @@ static int asf_read_header(AVFormatContext *s) 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)) { |