Module: libav Branch: release/0.8 Commit: 0f6364b62bb5f10b25d8cef88acbb9df84fd7f48
Author: Anton Khirnov <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Thu Mar 28 10:09:36 2013 +0100 bmv: check for len being valid in bmv_decode_frame(). It can be 0 or -1 for invalid files, which may result in invalid memory access. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] (cherry picked from commit b88f902125ee808c8366e9dcb3f21e4c227483fc) Conflicts: libavcodec/bmv.c --- libavcodec/bmv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/bmv.c b/libavcodec/bmv.c index 49346a4..920e752 100644 --- a/libavcodec/bmv.c +++ b/libavcodec/bmv.c @@ -134,7 +134,7 @@ static int decode_bmv_frame(const uint8_t *source, int src_len, uint8_t *frame, mode += 1 + advance_mode; if (mode >= 4) mode -= 3; - if (FFABS(dst_end - dst) < len) + if (len <= 0 || FFABS(dst_end - dst) < len) return -1; switch (mode) { case 1: _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
