diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-18 16:49:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-18 16:49:46 +0200 |
| commit | 601d072e68fb2967e561980336bea0b0625e629e (patch) | |
| tree | 93cf3da6478cd135f60e602e3bc0195de01ec4d0 | |
| parent | e531e73a6f0f7b4099ef5ed7ede949e4f75d106c (diff) | |
| download | ffmpeg-601d072e68fb2967e561980336bea0b0625e629e.tar.gz | |
diracdec: check xybsep
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/diracdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index b5395db766..ad70fb212b 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -856,7 +856,7 @@ static int dirac_unpack_prediction_parameters(DiracContext *s) /*[DIRAC_STD] 11.2.4 motion_data_dimensions() Calculated in function dirac_unpack_block_motion_data */ - if (s->plane[0].xbsep < s->plane[0].xblen/2 || s->plane[0].ybsep < s->plane[0].yblen/2) { + if (!s->plane[0].xbsep || !s->plane[0].ybsep || s->plane[0].xbsep < s->plane[0].xblen/2 || s->plane[0].ybsep < s->plane[0].yblen/2) { av_log(s->avctx, AV_LOG_ERROR, "Block separation too small\n"); return -1; } |