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

lavc/mjpegdec: Only read JFIF thumbnail size if the segment is long enough. 

Fixes ticket #5805.
This commit is contained in:
Carl Eugen Hoyos 2016-09-03 14:21:46 +02:00
parent b4d7c1f84b
commit e82b181f80
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mjpegdec.c
View File

@ -1690,6 +1690,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
s->avctx->sample_aspect_ratio.num,
s->avctx->sample_aspect_ratio.den);
len -= 8;
if (len >= 2) {
t_w = get_bits(&s->gb, 8);
t_h = get_bits(&s->gb, 8);
if (t_w && t_h) {
@ -1697,7 +1699,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
if (len -10 - (t_w * t_h * 3) > 0)
len -= t_w * t_h * 3;
}
len -= 10;
len -= 2;
}
goto out;
}

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 54
#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \