From 27fa70fdfe87b7cb54c1852f2922fafa16370c01 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Tue, 12 Jan 2016 16:13:27 +0100
Subject: [PATCH] lavc/mjpeg2jpeg: Check for jpeg file header.
---
libavcodec/mjpeg2jpeg_bsf.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c
index 68640db9e62..71f015491ab 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;
--
GitLab