From: Shitiz Garg <mail-5deEcKV3Bynk1uMJSBkQmQ@public.gmane.org>
Date: Thu, 15 Dec 2011 23:20:21 +0000 (+0530)
Subject: cljr: Check if width or height are positive integers
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4af0262f7d531c33b00d7f9dbca808d9c62d6a84;p=ffmpeg

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>
---

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 7ae3e7eeeb5..2b0142b9799 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -61,6 +61,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");