diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 14:28:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-14 17:56:21 +0200 |
| commit | 814dd3e9ebc617707dc7dacd735f221aaac2327a (patch) | |
| tree | 7a67cbd7f76de138112848d39150d27609ce0edc | |
| parent | 224b47f76dbe360a394ef85b9a3beaf11bb39c5f (diff) | |
| download | ffmpeg-814dd3e9ebc617707dc7dacd735f221aaac2327a.tar.gz | |
avcodec/opus_silk: Fix integer overflow and out of array read
Fixes: 1362/clusterfuzz-testcase-minimized-6097275002552320
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4654baff125d937ae0b1037aa5f0bf53c7351658)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/opus_silk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c index bfaf1d7d00..dbf6756864 100644 --- a/libavcodec/opus_silk.c +++ b/libavcodec/opus_silk.c @@ -128,8 +128,7 @@ static inline void silk_stabilize_lsf(int16_t nlsf[16], int order, const uint16_ if (nlsf[0] < min_delta[0]) nlsf[0] = min_delta[0]; for (i = 1; i < order; i++) - if (nlsf[i] < nlsf[i - 1] + min_delta[i]) - nlsf[i] = nlsf[i - 1] + min_delta[i]; + nlsf[i] = FFMAX(nlsf[i], FFMIN(nlsf[i - 1] + min_delta[i], 32767)); /* push backwards to increase distance */ if (nlsf[order-1] > 32768 - min_delta[order]) |