RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/mjpegdec: Do not overread too short JFIF tags. 

Fixes ticket #6055.
This commit is contained in:
Carl Eugen Hoyos 2017-01-01 14:19:48 +01:00
parent b7a6d28e5e
commit 4acea512f3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mjpegdec.c
View File

@ -1670,6 +1670,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
if (id == AV_RB32("JFIF")) { if (id == AV_RB32("JFIF")) {
int t_w, t_h, v1, v2; int t_w, t_h, v1, v2;
if (len < 8)
goto out;
skip_bits(&s->gb, 8); /* the trailing zero-byte */ skip_bits(&s->gb, 8); /* the trailing zero-byte */
v1 = get_bits(&s->gb, 8); v1 = get_bits(&s->gb, 8);
v2 = get_bits(&s->gb, 8); v2 = get_bits(&s->gb, 8);