From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Fri, 23 Jan 2015 15:03:09 +0000 (+0000)
Subject: nuv: validate image size
X-Git-Tag: android-x86-6.0-r1~10^2~190
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e71149a7a5b10ed7baa5a06f47d0313c7bd8df52;p=android-x86%2Fexternal-ffmpeg.git

nuv: validate image size

Avoid a division by zero.

CC: libav-stable@libav.org
Bug-Id: CID 717750
---

diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 9336912fe0..586aec65f6 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/intfloat.h"
 #include "avformat.h"
@@ -188,6 +189,10 @@ static int nuv_header(AVFormatContext *s)
             return AVERROR(ENOMEM);
         ctx->v_id = vst->index;
 
+        ret = av_image_check_size(width, height, 0, ctx);
+        if (ret < 0)
+            return ret;
+
         vst->codec->codec_type            = AVMEDIA_TYPE_VIDEO;
         vst->codec->codec_id              = AV_CODEC_ID_NUV;
         vst->codec->width                 = width;