Browse Source

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>
tags/n2.1
Martin Storsjö 12 years ago
parent
commit
cc41167aed
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavformat/asfdec.c

+ 3
- 1
libavformat/asfdec.c View File

@@ -743,7 +743,9 @@ static int asf_read_header(AVFormatContext *s)
if (ret < 0) if (ret < 0)
return ret; return ret;
} else if (!ff_guidcmp(&g, &ff_asf_stream_header)) { } 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)) { } else if (!ff_guidcmp(&g, &ff_asf_comment_header)) {
asf_read_content_desc(s, gsize); asf_read_content_desc(s, gsize);
} else if (!ff_guidcmp(&g, &ff_asf_language_guid)) { } else if (!ff_guidcmp(&g, &ff_asf_language_guid)) {


Loading…
Cancel
Save