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

Fixes ticket #6055.
pull/246/head
Carl Eugen Hoyos 8 years ago
parent b7a6d28e5e
commit 4acea512f3
  1. 2
      libavcodec/mjpegdec.c

@ -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);

Loading…
Cancel
Save