diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-11 03:33:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 00:47:05 +0100 |
| commit | 2b8c9c1f7de835d50937a8bf2ae90a61929b3bdd (patch) | |
| tree | e7aed5b468b573d431f126a5725c9237abff300c /libavcodec/x86/h264_i386.h | |
| parent | 3eb6eeaab0cd42886abbae76c90d005ac82ec9ba (diff) | |
| download | ffmpeg-2b8c9c1f7de835d50937a8bf2ae90a61929b3bdd.tar.gz | |
avcodec/mjpegdec: Skip blocks which are outside the visible area
Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash.avi
Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 08509c8f86626815a3e9e68d600d1aacbb8df4bf)
Conflicts:
libavcodec/mjpegdec.c
(cherry picked from commit 5553947db2af443778f781a107d9fe9ad6ec5d17)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_i386.h')
0 files changed, 0 insertions, 0 deletions