summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-05 19:34:17 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-10-25 00:22:33 +0200
commitf4ecf6c39de9a7cc1dae70cf87c225771001e883 (patch)
tree9a2bd65105978d39365f4d69557474e90064dca9 /libavcodec
parent42eb78059d149abcd994f46c8b8a0dd98e86b594 (diff)
downloadffmpeg-streaming-f4ecf6c39de9a7cc1dae70cf87c225771001e883.zip
ffmpeg-streaming-f4ecf6c39de9a7cc1dae70cf87c225771001e883.tar.gz
avcodec/ralf: Skip initializing unused filter variables
Fixes: left shift of negative value -1 Fixes: 17890/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RALF_fuzzer-5643307467669504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ralf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c
index 006ab46..1d881cf 100644
--- a/libavcodec/ralf.c
+++ b/libavcodec/ralf.c
@@ -234,8 +234,10 @@ static int decode_channel(RALFContext *ctx, GetBitContext *gb, int ch,
int *dst = ctx->channel_data[ch];
ctx->filter_params = get_vlc2(gb, set->filter_params.table, 9, 2);
- ctx->filter_bits = (ctx->filter_params - 2) >> 6;
- ctx->filter_length = ctx->filter_params - (ctx->filter_bits << 6) - 1;
+ if (ctx->filter_params > 1) {
+ ctx->filter_bits = (ctx->filter_params - 2) >> 6;
+ ctx->filter_length = ctx->filter_params - (ctx->filter_bits << 6) - 1;
+ }
if (ctx->filter_params == FILTER_RAW) {
for (i = 0; i < length; i++)
OpenPOWER on IntegriCloud