summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2019-07-26 15:26:08 +0200
committerMichael Niedermayer <[email protected]>2019-12-02 19:41:49 +0100
commit92c75a313ec6d20418e25a4f1d08eb4d2383d4ec (patch)
tree0502ec1087d265173d61f22e674974ba8331bb10
parent5818ae3cff3295185b3317065b4482e527623545 (diff)
avcodec/alsdec: Check for block_length <= 0 in read_var_block_data()
Fixes: left shift of negative value -1 Fixes: 15719/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ALS_fuzzer-5685731105701888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit be4fb282f9fb00d9c267dcc477745e2e468e758f) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/alsdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index e93f44e2e0..1851296b05 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -647,7 +647,7 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
// do not continue in case of a damaged stream since
// block_length must be evenly divisible by sub_blocks
- if (bd->block_length & (sub_blocks - 1)) {
+ if (bd->block_length & (sub_blocks - 1) || bd->block_length <= 0) {
av_log(avctx, AV_LOG_WARNING,
"Block length is not evenly divisible by the number of subblocks.\n");
return AVERROR_INVALIDDATA;