Module: libav Branch: release/0.8 Commit: 1c8e2561b48916f409980bf66ff247f001abc3b3
Author: Anton Khirnov <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Sat Sep 29 10:39:49 2012 +0200 indeo3: fix out of cell write. Fixes CVE-2012-2776. CC:[email protected] Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind (cherry picked from commit e4d4044339b9c3b0f45f7203cd026eda3c0414c0) Signed-off-by: Reinhard Tartler <[email protected]> --- libavcodec/indeo3.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index b7ef9e5..294527e 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -416,6 +416,9 @@ static int decode_cell_data(Cell *cell, uint8_t *block, uint8_t *ref_block, blk_row_offset = (row_offset << (2 + v_zoom)) - (cell->width << 2); line_offset = v_zoom ? row_offset : 0; + if (cell->height & v_zoom || cell->width & h_zoom) + return IV3_BAD_DATA; + for (y = 0; y < cell->height; is_first_row = 0, y += 1 + v_zoom) { for (x = 0; x < cell->width; x += 1 + h_zoom) { ref = ref_block; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
