asfdec: Check the return value of asf_read_stream_properties
authorMartin Storsjö <martin@martin.st>
Sat, 28 Sep 2013 20:32:57 +0000 (23:32 +0300)
committerMartin Storsjö <martin@martin.st>
Mon, 30 Sep 2013 07:48:58 +0000 (10:48 +0300)
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>
libavformat/asfdec.c

index b99cb02..5b4366e 100644 (file)
@@ -743,7 +743,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)) {