OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8d617b1
)
bmv: check for len being valid in bmv_decode_frame().
author
Anton Khirnov
<anton@khirnov.net>
Thu, 28 Mar 2013 09:09:36 +0000
(10:09 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Thu, 4 Apr 2013 05:54:27 +0000
(07:54 +0200)
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
libavcodec/bmv.c
patch
|
blob
|
history
diff --git
a/libavcodec/bmv.c
b/libavcodec/bmv.c
index
b6b685b
..
941051b
100644
(file)
--- a/
libavcodec/bmv.c
+++ b/
libavcodec/bmv.c
@@
-135,7
+135,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: