summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-12-15 22:00:31 +0100
committerLuca Barbato <lu_zero@gentoo.org>2015-12-16 22:19:58 +0100
commit17776638c392d104975aba169e17b186490e1d5e (patch)
treee78694beeab21d0534b75e51890254e7d150666b
parent90b1b9350c0a97c4065ae9054b83e57f48a0de1f (diff)
downloadffmpeg-17776638c392d104975aba169e17b186490e1d5e.tar.gz
opus: Fix typo causing overflow in silk_stabilize_lsf
Due to this typo max_center can be too large, causing nlsf to be set to too large values, which in turn can cause nlsf[i - 1] + min_delta[i] to overflow to a negative value, which is not allowed for nlsf and can cause an out of bounds read in silk_lsf2lpc. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavcodec/opus_silk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c
index f881325d7b..583801d65c 100644
--- a/libavcodec/opus_silk.c
+++ b/libavcodec/opus_silk.c
@@ -824,7 +824,7 @@ static inline void silk_stabilize_lsf(int16_t nlsf[16], int order, const uint16_
/* upper extent */
for (i = order; i > k; i--)
- max_center -= min_delta[k];
+ max_center -= min_delta[i];
max_center -= min_delta[k] >> 1;
/* move apart */