diff options
| author | Shitiz Garg <mail@dragooon.net> | 2011-12-15 22:20:21 +0000 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-12-18 23:52:53 +0100 |
| commit | 652d81b2c2201922f0fef2bbd171299ce3798d12 (patch) | |
| tree | 15f82efe16180a60d9ff7366bea5bbf5ce2849b4 /libavcodec | |
| parent | 2a216ca2ef29282cac9003a716b469b8c80c0a15 (diff) | |
| download | ffmpeg-streaming-652d81b2c2201922f0fef2bbd171299ce3798d12.zip ffmpeg-streaming-652d81b2c2201922f0fef2bbd171299ce3798d12.tar.gz | |
cljr: Check if width and 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: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/cljr.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index a5ee738..f40d4d1 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -57,6 +57,11 @@ static int decode_frame(AVCodecContext *avctx, if (p->data[0]) 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) { av_log(avctx, AV_LOG_ERROR, "Resolution larger than buffer size. Invalid header?\n"); |
