aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-18 14:37:19 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-20 02:05:09 +0200
commitd5abcaacb396ce379bb1e902d2582a7fc6ba2085 (patch)
treee5ed1269ed2663effa770a019bcda541419993c6
parente46f8c96d0c2964687a7da39cabdcc8e5d36dda2 (diff)
downloadffmpeg-d5abcaacb396ce379bb1e902d2582a7fc6ba2085.tar.gz
avcodec/takdec: Fixes: integer overflow in AV_SAMPLE_FMT_U8P output
Fixes: runtime error: signed integer overflow: 2147483543 + 128 cannot be represented in type 'int' Fixes: 2234/clusterfuzz-testcase-minimized-6266896041115648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 27c20068054d8c6786833234f7b6db19f1e98362) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/takdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index 31a6378805..5797af9988 100644
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -878,7 +878,7 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data,
uint8_t *samples = (uint8_t *)frame->extended_data[chan];
int32_t *decoded = s->decoded[chan];
for (i = 0; i < s->nb_samples; i++)
- samples[i] = decoded[i] + 0x80;
+ samples[i] = decoded[i] + 0x80U;
}
break;
case AV_SAMPLE_FMT_S16P: