diff options
| author | Michael Niedermayer <[email protected]> | 2019-10-01 00:10:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2019-12-06 20:30:57 +0100 |
| commit | 684fbde543473c9c6bb189052e5a6b948a7c23f5 (patch) | |
| tree | 9b091b2174c49766d4788e59eb176067f4f6e2f0 | |
| parent | cdb193839ac55563b5c287b54c9141079845d733 (diff) | |
avcodec/smacker: Fix integer overflows in pred[] in smka_decode_frame()
Fixes: signed integer overflow: -2147481503 + -32732 cannot be represented in type 'int'
Fixes: 17782/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMACKAUD_fuzzer-5769672225456128
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 a76897e19ca96127e07f5acc5a773b904dcf6124)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/smacker.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 3d55063b2c..dafef82c6a 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -740,7 +740,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } val |= h[3].values[res] << 8; - pred[1] += sign_extend(val, 16); + pred[1] += (unsigned)sign_extend(val, 16); *samples++ = pred[1]; } else { if(vlc[0].table) @@ -761,7 +761,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } val |= h[1].values[res] << 8; - pred[0] += sign_extend(val, 16); + pred[0] += (unsigned)sign_extend(val, 16); *samples++ = pred[0]; } } |