Defense of system crash due to damaged random file. (ffmpeg 2.8.1 patch)

Change-Id: Id0eced23749b7f4dd37b92f095f021f43561e282
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c5fa50d..a87b680 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1578,6 +1578,13 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
     AVCodecInternal *avci = avctx->internal;
     int ret;
 
+    if (!avctx->codec)
+        return AVERROR(EINVAL);
+    if (avctx->codec->type != AVMEDIA_TYPE_VIDEO) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid media type for video\n");
+        return AVERROR(EINVAL);
+    }
+
     *got_picture_ptr = 0;
     if ((avctx->coded_width || avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx))
         return -1;