MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ec: check that reference pictures have matching parameters before using them.

Browse Source 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-21 16:37:29 +01:00
parent bdeb61ccc6
commit 669d50b445
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/error_resilience.c
View File

@ -859,6 +859,22 @@ void ff_er_frame_end(ERContext *s)
(s->avctx->skip_top + s->avctx->skip_bottom)) {
return;
}
if (s->last_pic) {
if (s->last_pic->f.width != s->cur_pic->f.width ||
s->last_pic->f.height != s->cur_pic->f.height ||
s->last_pic->f.format != s->cur_pic->f.format) {
av_log(s->avctx, AV_LOG_WARNING, "Cannot use previous picture in error concealment\n");
s->last_pic = NULL;
}
}
if (s->next_pic) {
if (s->next_pic->f.width != s->cur_pic->f.width ||
s->next_pic->f.height != s->cur_pic->f.height ||
s->next_pic->f.format != s->cur_pic->f.format) {
av_log(s->avctx, AV_LOG_WARNING, "Cannot use next picture in error concealment\n");
s->next_pic = NULL;
}
}
if (s->cur_pic->f.motion_val[0] == NULL) {
av_log(s->avctx, AV_LOG_ERROR, "Warning MVs not available\n");