[FFmpeg-cvslog] lavc/mjpeg2jpeg: Check for jpeg file header.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Jan 12 16:13:27 2016 +0100| [27fa70fdfe87b7cb54c1852f2922fafa16370c01] | committer: Carl Eugen Hoyos

lavc/mjpeg2jpeg: Check for jpeg file header.

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

 libavcodec/mjpeg2jpeg_bsf.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c
index 68640db..71f0154 100644
--- a/libavcodec/mjpeg2jpeg_bsf.c
+++ b/libavcodec/mjpeg2jpeg_bsf.c
@@ -28,6 +28,7 @@
 
 #include "libavutil/error.h"
 #include "libavutil/mem.h"
+#include "libavutil/intreadwrite.h"
 
 #include "avcodec.h"
 #include "jpegtables.h"
@@ -88,6 +89,10 @@ static int mjpeg2jpeg_filter(AVBitStreamFilterContext *bsfc,
         av_log(avctx, AV_LOG_ERROR, "input is truncated\n");
         return AVERROR_INVALIDDATA;
     }
+    if (AV_RB16(buf) != 0xffd8) {
+        av_log(avctx, AV_LOG_ERROR, "input is not MJPEG\n");
+        return AVERROR_INVALIDDATA;
+    }
     if (memcmp("AVI1", buf + 6, 4)) {
         av_log(avctx, AV_LOG_ERROR, "input is not MJPEG/AVI1\n");
         return AVERROR_INVALIDDATA;