Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'

* commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad': asfdec: Check the return value of asf_read_stream_properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 8aa6ffd8fa
parent 3841e4510b cc41167aed
commit 8aa6ffd8fa
1 changed files with 3 additions and 1 deletions
--- 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)) {