RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cljr: Check if width or height are positive integers 

width and height might get passed as 0 and would cause floating point
exceptions in decode_frame.
Fixes bugzilla #149

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Shitiz Garg 2011-12-16 04:50:21 +05:30 committed by Michael Niedermayer
parent 7b92863f30
commit 4af0262f7d
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/cljr.c
View File

@ -61,6 +61,11 @@ static int decode_frame(AVCodecContext *avctx,
if (p->data[0]) if (p->data[0])
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
if (avctx->height <= 0 || avctx->width <= 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid width or height\n");
return AVERROR_INVALIDDATA;
}
if (buf_size / avctx->height < avctx->width) { if (buf_size / avctx->height < avctx->width) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Resolution larger than buffer size. Invalid header?\n"); "Resolution larger than buffer size. Invalid header?\n");