aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-12-15 22:00:31 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-12-17 20:04:30 +0100
commit796f1a24f59b55cebea779e8360a50f56f3f20fe (patch)
tree62adbbbfeefda8c78a5202f4a376a4b5ad729c33 /libavcodec
parent0b24a0e0f12f0a57a54bfbbf9637855ef8b2f698 (diff)
downloadffmpeg-796f1a24f59b55cebea779e8360a50f56f3f20fe.tar.gz
opus_silk: 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. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> (cherry picked from commit f61d44b74aaae1d306d8a0d38b7b3d4292c89ced) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec')
-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 841d1ed25c..73526f9800 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 */