virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ff_mss12_decode_init: check dimensions

Browse Source 
Fixes assertion failure

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-24 01:25:02 +01:00
parent df39c3ce38
commit ee9151b616
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mss12.c
View File

@ -586,6 +586,11 @@ av_cold int ff_mss12_decode_init(MSS12Context *c, int version,
avctx->coded_width, avctx->coded_height); avctx->coded_width, avctx->coded_height);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (avctx->coded_width < 1 || avctx->coded_height < 1) {
av_log(avctx, AV_LOG_ERROR, "Frame dimensions %dx%d too small",
avctx->coded_width, avctx->coded_height);
return AVERROR_INVALIDDATA;
}
av_log(avctx, AV_LOG_DEBUG, "Encoder version %d.%d\n", av_log(avctx, AV_LOG_DEBUG, "Encoder version %d.%d\n",
AV_RB32(avctx->extradata + 4), AV_RB32(avctx->extradata + 8)); AV_RB32(avctx->extradata + 4), AV_RB32(avctx->extradata + 8));