diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 17:36:14 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2015-03-08 22:11:31 -0400 |
| commit | 789f433bc6376e6e45d41ae491007d482fa1df85 (patch) | |
| tree | 736cc61edc6f0d31d0bab21cac13396872a664c4 | |
| parent | 3756b306a259d1376ce90404771c4d0ea7e23162 (diff) | |
| download | ffmpeg-789f433bc6376e6e45d41ae491007d482fa1df85.tar.gz | |
utvideodec: Handle slice_height being zero
Fixes out of array accesses.
CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Bug-Id: CVE-2014-9604
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d)
(cherry picked from commit 3a417a86b330b7c1acf9db4f729be7d619caaded)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit e032e647dd79e7748145792dfee0358eccb1982e)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/utvideodec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 3f8f690ee0..3367ed4a1c 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -211,6 +211,8 @@ static void restore_median(uint8_t *src, int step, int stride, slice_start = ((slice * height) / slices) & cmask; slice_height = ((((slice + 1) * height) / slices) & cmask) - slice_start; + if (!slice_height) + continue; bsrc = src + slice_start * stride; @@ -267,6 +269,8 @@ static void restore_median_il(uint8_t *src, int step, int stride, slice_height = ((((slice + 1) * height) / slices) & cmask) - slice_start; slice_height >>= 1; + if (!slice_height) + continue; bsrc = src + slice_start * stride; |