[FFmpeg-cvslog] avcodec/012v: Check dimensions more completely

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 10 20:21:14 2015 +0100| [9f650fb5fb3270df6ef570a919b988a0a97a2e1c] | committer: Michael Niedermayer

avcodec/012v: Check dimensions more completely

Fixes division by 0

Found-by: Thomas Lindroth <thomas.lindroth at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d3b25383daffac154846daeb4e4fb46569e728db)

Conflicts:

	libavcodec/012v.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f650fb5fb3270df6ef570a919b988a0a97a2e1c
---

 libavcodec/012v.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/012v.c b/libavcodec/012v.c
index 6f4533b..8151e2a 100644
--- a/libavcodec/012v.c
+++ b/libavcodec/012v.c
@@ -54,8 +54,8 @@ static int zero12v_decode_frame(AVCodecContext *avctx, void *data,
     if (pic->data[0])
         avctx->release_buffer(avctx, pic);
 
-    if (width == 1) {
-        av_log(avctx, AV_LOG_ERROR, "Width 1 not supported.\n");
+    if (width <= 1 || avctx->height <= 0) {
+        av_log(avctx, AV_LOG_ERROR, "Dimensions %dx%d not supported.\n", width, avctx->height);
         return AVERROR_INVALIDDATA;
     }
     if (avpkt->size < avctx->height * stride) {