Commit 251c0ea6 authored by Ming Qian's avatar Ming Qian Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-jpeg: ignore the unknown APP14 marker 



The legal identifier of APP14 is "Adobe\0",
but sometimes it may be
"This is an unknown APP marker . Compliant decoders must ignore it."
In this case, just ignore it.
It won't affect the decode result.

Fixes: b8035f79 ("media: Add parsing for APP14 data segment in jpeg helpers")
Signed-off-by: default avatarMing Qian <ming.qian@nxp.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 41959c4f

drivers/media/v4l2-core/v4l2-jpeg.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static int jpeg_parse_app14_data(struct jpeg_stream *stream, 
	/* Check for "Adobe\0" in Ap1..6 */

	if (stream->curr + 6 > stream->end ||

	    strncmp(stream->curr, "Adobe\0", 6))

		return -EINVAL;

		return jpeg_skip(stream, lp - 2);



	/* get to Ap12 */

	ret = jpeg_skip(stream, 11);