diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-03 17:05:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-05 18:29:12 +0100 |
| commit | 140626b386c135ae54baff903a1abe22e5319a97 (patch) | |
| tree | b62db2ec2670e7fc64e1b2f6efa93b55191d274b | |
| parent | 4a2f30eeff17532526928456c3e735c1457757a0 (diff) | |
| download | ffmpeg-140626b386c135ae54baff903a1abe22e5319a97.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 b7237e18f0..5f5802c97f 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 */ |