aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-02 21:16:27 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-20 10:59:27 +0100
commit0350f373f7f0eebc2f49a5144511ba4a7b718c1b (patch)
tree4fee1fc176129fd7341a63afafac89648570c940
parent4d8d2f1991cd7514a3ccd6e4ad5e62bb8f1fba57 (diff)
downloadffmpeg-0350f373f7f0eebc2f49a5144511ba4a7b718c1b.tar.gz
avcodec/apedec: Check length in long_filter_high_3800()
Fixes out of array read Fixes: 0a7ff0c1d93da9cef28a315ec91b692a/asan_heap-oob_4a52e5_3604_9c56dbb20e308f4faeef7b35f688521a.ape Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit cd7524fdd13dc8d0cf22e2cfd8300a245542b13a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/apedec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 03afd756dc..9984b4099b 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -892,6 +892,9 @@ static void long_filter_high_3800(int32_t *buffer, int order, int shift, int len
int32_t dotprod, sign;
int32_t coeffs[256], delay[256];
+ if (order >= length)
+ return;
+
memset(coeffs, 0, order * sizeof(*coeffs));
for (i = 0; i < order; i++)
delay[i] = buffer[i];