Commit fcf0ebc4 authored by Nick Renieris's avatar Nick Renieris Committed by Paul B Mahol

lavc/mjpegdec: Skip unknown APPx marker on bayer images

Samples:
- Embedded JPEG images in the DNG images here:
  https://www.photographyblog.com/previews/pentax_k1_photosSigned-off-by: 's avatarNick Renieris <velocityra@gmail.com>
parent c44aa7f1
......@@ -1807,8 +1807,15 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
int len, id, i;
len = get_bits(&s->gb, 16);
if (len < 6)
return AVERROR_INVALIDDATA;
if (len < 6) {
if (s->bayer) {
// Pentax K-1 (digital camera) JPEG images embedded in DNG images contain unknown APP0 markers
av_log(s->avctx, AV_LOG_WARNING, "skipping APPx (len=%"PRId32") for bayer-encoded image\n", len);
skip_bits(&s->gb, len);
return 0;
} else
return AVERROR_INVALIDDATA;
}
if (8 * len > get_bits_left(&s->gb))
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