diff options
| author | Michael Niedermayer <[email protected]> | 2019-10-01 00:10:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2019-12-31 19:51:56 +0100 |
| commit | a3e5542744319d1f80ecbbd42c2e92b4f928e287 (patch) | |
| tree | d91f1d4fa19360289724abf0ee4a1c020297ac4f | |
| parent | 77552653877f93453b1850043420a256ab5a9bcf (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 27da0bc97a..3e3eed9f7e 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -735,7 +735,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) @@ -756,7 +756,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]; } } |