diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-28 10:09:36 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-04-06 11:47:01 +0200 |
| commit | ba31b72f462cd95609d13713fff42b1b000a56c7 (patch) | |
| tree | 63dee2b50b355973b83563aee99497ea7de04899 | |
| parent | 75948682969694613e5226cd48c248eacfa9a425 (diff) | |
| download | ffmpeg-ba31b72f462cd95609d13713fff42b1b000a56c7.tar.gz | |
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: libav-stable@libav.org
(cherry picked from commit b88f902125ee808c8366e9dcb3f21e4c227483fc)
Conflicts:
libavcodec/bmv.c
| -rw-r--r-- | libavcodec/bmv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bmv.c b/libavcodec/bmv.c index a7f21eceb2..bcb1380030 100644 --- a/libavcodec/bmv.c +++ b/libavcodec/bmv.c @@ -136,7 +136,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: |