diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 14:20:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 14:20:51 +0200 |
| commit | 208be6b54a91b7da699497d0bb361dbf542d6518 (patch) | |
| tree | 4a4e69948369ae7359b35c0933b1d4a22dc228cb /libavcodec/bmv.c | |
| parent | cdafcf838cc7f559b67863183ad1283c97a9ae70 (diff) | |
| parent | d1016dccdcb10486245e5d7c186cc31af54b2a9c (diff) | |
Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'
* commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c':
xmv: check audio track parameters validity.
bmv: check for len being valid in bmv_decode_frame().
Conflicts:
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '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 2628e4a2c0..0f3f9f32c0 100644 --- a/libavcodec/bmv.c +++ b/libavcodec/bmv.c @@ -139,7 +139,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 AVERROR_INVALIDDATA; switch (mode) { case 1: |