summaryrefslogtreecommitdiff
path: root/libavcodec/aacsbr_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-05 23:00:59 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-06 00:33:19 +0200
commita8ad83b793e883b8c6d114f81073a4e40c0308a3 (patch)
tree3a9dbfa5aea0bd219e2faecf14f0c58713b38937 /libavcodec/aacsbr_template.c
parenta234b5ade3ca6cde805b92b8b6ecacf693460a8c (diff)
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>
Diffstat (limited to 'libavcodec/aacsbr_template.c')
-rw-r--r--libavcodec/aacsbr_template.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c
index 750131c64c..aaa48ef802 100644
--- a/libavcodec/aacsbr_template.c
+++ b/libavcodec/aacsbr_template.c
@@ -640,6 +640,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;
}
@@ -695,6 +696,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;
}