diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-03 17:05:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-03 17:32:54 +0100 |
| commit | 31d46dc97dc33834b899ca059c01137e9c4ec60d (patch) | |
| tree | 5ed11b1168ac3e4b0cbabd117d987c869b70a14f | |
| parent | 5790ce62732fc4f384bb109b4d7cdf313e7310b8 (diff) | |
| download | ffmpeg-31d46dc97dc33834b899ca059c01137e9c4ec60d.tar.gz | |
avcodec/flacdec: Fix signed integer overflow in decode_subframe_fixed()
Fixes undefined behavior
Fixes: 640912-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 83a75bf6c31b3c0ce2ca7e1426d1f2e3df634239)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/flacdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 8653da7d2a..0c4ab43457 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -268,7 +268,8 @@ static int decode_subframe_fixed(FLACContext *s, int32_t *decoded, int pred_order, int bps) { const int blocksize = s->blocksize; - int av_uninit(a), av_uninit(b), av_uninit(c), av_uninit(d), i; + unsigned av_uninit(a), av_uninit(b), av_uninit(c), av_uninit(d); + int i; int ret; /* warm up samples */ |