summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2019-10-01 00:10:47 +0200
committerMichael Niedermayer <[email protected]>2020-07-01 12:49:26 +0200
commit31c2c9e8118402a0312ca70f35be9c7cd94fe5e6 (patch)
tree2aba6dc71bfe600bb8887a7c48e91630d46ab686
parentda9b6f9e10b2c3455e79a51218ad9eb9d7f1b7e2 (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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 843b73d33b..8503fee5ec 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -727,7 +727,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)
@@ -748,7 +748,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];
}
}