Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/takdec: Fix overflow with large sample rates

Browse Source 
Fixes: signed integer overflow: 2147483647 + 511 cannot be represented in type 'int'
Fixes: 17899/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-5719753322135552

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/324/head
Michael Niedermayer 5 years ago
parent 37d8ae9da8
commit 42eb78059d
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/takdec.c

4
libavcodec/takdec.c
Unescape View File

@ -176,8 +176,8 @@ static void set_sample_rate_params(AVCodecContext *avctx)
} else {
shift = 0;
}
s->uval = FFALIGN(avctx->sample_rate + 511 >> 9, 4) << shift;
s->subframe_scale = FFALIGN(avctx->sample_rate + 511 >> 9, 4) << 1;
s->uval = FFALIGN(avctx->sample_rate + 511LL >> 9, 4) << shift;
s->subframe_scale = FFALIGN(avctx->sample_rate + 511LL >> 9, 4) << 1;
}
static av_cold int tak_decode_init(AVCodecContext *avctx)

Write Preview
Loading…
Cancel
Save