diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-05 23:00:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-23 13:15:17 +0200 |
| commit | 2b3b77e722e9ffdef7dee9d335ece2e6fd4d6703 (patch) | |
| tree | 8ed6c8267c52dbcd62d341f80dcb35462f89214b /libavcodec | |
| parent | 766c53f9e5817e1d56b74b51615de6a191832e1e (diff) | |
| download | ffmpeg-2b3b77e722e9ffdef7dee9d335ece2e6fd4d6703.tar.gz | |
avcodec/aacsbr_template: Do not leave bs_num_env invalid
Fixes out of array read
Fixes: 1349/clusterfuzz-testcase-minimized-5370707196248064
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 a8ad83b793e883b8c6d114f81073a4e40c0308a3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacsbr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index 9d12cb868f..bcedf26563 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -662,6 +662,7 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr, av_log(ac->avctx, AV_LOG_ERROR, "Invalid bitstream, too many SBR envelopes in FIXFIX type SBR frame: %d\n", ch_data->bs_num_env); + ch_data->bs_num_env = 2; return -1; } @@ -717,6 +718,7 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr, av_log(ac->avctx, AV_LOG_ERROR, "Invalid bitstream, too many SBR envelopes in VARVAR type SBR frame: %d\n", ch_data->bs_num_env); + ch_data->bs_num_env = 2; return -1; } |