[FFmpeg-cvslog] avcodec/adpcm: XA: Check shift similar to filter
Michael Niedermayer
git at videolan.org
Tue Jul 7 21:40:30 EEST 2020
ffmpeg | branch: release/4.2 | Michael Niedermayer <michael at niedermayer.cc> | Sun May 31 14:59:02 2020 +0200| [7991001f9d5cb8ac07d41f7d9c3ce2b470b9e96d] | committer: Michael Niedermayer
avcodec/adpcm: XA: Check shift similar to filter
Fixes: negative shift
Fixes: 22499/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_XA_fuzzer-5765452130418688
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 6d96bae9c480e020e9f51fabd5642d7ae6020943)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7991001f9d5cb8ac07d41f7d9c3ce2b470b9e96d
---
libavcodec/adpcm.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 63c307c0e6..651164301c 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -426,6 +426,10 @@ static int xa_decode(AVCodecContext *avctx, int16_t *out0, int16_t *out1,
avpriv_request_sample(avctx, "unknown XA-ADPCM filter %d", filter);
filter=0;
}
+ if (shift < 0) {
+ avpriv_request_sample(avctx, "unknown XA-ADPCM shift %d", shift);
+ shift = 0;
+ }
f0 = xa_adpcm_table[filter][0];
f1 = xa_adpcm_table[filter][1];
@@ -451,10 +455,14 @@ static int xa_decode(AVCodecContext *avctx, int16_t *out0, int16_t *out1,
shift = 12 - (in[5+i*2] & 15);
filter = in[5+i*2] >> 4;
- if (filter >= FF_ARRAY_ELEMS(xa_adpcm_table)) {
+ if (filter >= FF_ARRAY_ELEMS(xa_adpcm_table) || shift < 0) {
avpriv_request_sample(avctx, "unknown XA-ADPCM filter %d", filter);
filter=0;
}
+ if (shift < 0) {
+ avpriv_request_sample(avctx, "unknown XA-ADPCM shift %d", shift);
+ shift = 0;
+ }
f0 = xa_adpcm_table[filter][0];
f1 = xa_adpcm_table[filter][1];
More information about the ffmpeg-cvslog
mailing list