RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 18:21:04 +00:00
Code Issues Projects Releases Wiki Activity

mvdec: check var_read_string() return value

Browse Source 
Prevent null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-27 02:14:38 +01:00
parent 362271d72f
commit 5de286ef88
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mvdec.c
View File

@ -158,6 +158,8 @@ static int parse_video_var(AVFormatContext *avctx, AVStream *st, const char *nam
st->nb_frames = st->duration = var_read_int(pb, size); st->nb_frames = st->duration = var_read_int(pb, size);
} else if (!strcmp(name, "COMPRESSION")) { } else if (!strcmp(name, "COMPRESSION")) {
char * str = var_read_string(pb, size); char * str = var_read_string(pb, size);
if (!str)
return AVERROR_INVALIDDATA;
if (!strcmp(str, "1")) { if (!strcmp(str, "1")) {
st->codec->codec_id = AV_CODEC_ID_MVC1; st->codec->codec_id = AV_CODEC_ID_MVC1;
} else if (!strcmp(str, "2")) { } else if (!strcmp(str, "2")) {