Commit 27fa70fd authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavc/mjpeg2jpeg: Check for jpeg file header.

parent adef8ee7
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "libavutil/error.h" #include "libavutil/error.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "jpegtables.h" #include "jpegtables.h"
...@@ -88,6 +89,10 @@ static int mjpeg2jpeg_filter(AVBitStreamFilterContext *bsfc, ...@@ -88,6 +89,10 @@ static int mjpeg2jpeg_filter(AVBitStreamFilterContext *bsfc,
av_log(avctx, AV_LOG_ERROR, "input is truncated\n"); av_log(avctx, AV_LOG_ERROR, "input is truncated\n");
return AVERROR_INVALIDDATA; 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)) { if (memcmp("AVI1", buf + 6, 4)) {
av_log(avctx, AV_LOG_ERROR, "input is not MJPEG/AVI1\n"); av_log(avctx, AV_LOG_ERROR, "input is not MJPEG/AVI1\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment