virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header

Browse Source 
The code assumes that s->streams[0] is valid.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2016-11-08 00:42:23 +01:00
parent 0a24587588
commit ff100c9dd9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/matroskadec.c
View File

@@ -3776,6 +3776,11 @@ static int webm_dash_manifest_read_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, "Failed to read file headers\n"); av_log(s, AV_LOG_ERROR, "Failed to read file headers\n");
return -1; return -1;
} }
if (!s->nb_streams) {
matroska_read_close(s);
av_log(s, AV_LOG_ERROR, "No streams found\n");
return AVERROR_INVALIDDATA;
}
if (!matroska->is_live) { if (!matroska->is_live) {
buf = av_asprintf("%g", matroska->duration); buf = av_asprintf("%g", matroska->duration);