virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/ffwavesynth: Avoid undefined operation on ts overflow

Browse Source 
Alternatively these conditions could be treated as errors
Fixes: 23147/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFWAVESYNTH_fuzzer-5639254549200896
Fixes: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'int64_t' (aka 'long')

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-06-13 21:47:03 +02:00
parent 75e2ac4f07
commit 584d334afd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ffwavesynth.c
View File

@ -444,7 +444,7 @@ static int wavesynth_decode(AVCodecContext *avc, void *rframe, int *rgot_frame,
if (r < 0) if (r < 0)
return r; return r;
pcm = (int16_t *)frame->data[0]; pcm = (int16_t *)frame->data[0];
for (s = 0; s < duration; s++, ts++) { for (s = 0; s < duration; s++, ts+=(uint64_t)1) {
memset(channels, 0, avc->channels * sizeof(*channels)); memset(channels, 0, avc->channels * sizeof(*channels));
if (ts >= ws->next_ts) if (ts >= ws->next_ts)
wavesynth_enter_intervals(ws, ts); wavesynth_enter_intervals(ws, ts);
@ -452,7 +452,7 @@ static int wavesynth_decode(AVCodecContext *avc, void *rframe, int *rgot_frame,
for (c = 0; c < avc->channels; c++) for (c = 0; c < avc->channels; c++)
*(pcm++) = channels[c] >> 16; *(pcm++) = channels[c] >> 16;
} }
ws->cur_ts += duration; ws->cur_ts += (uint64_t)duration;
*rgot_frame = 1; *rgot_frame = 1;
return packet->size; return packet->size;
} }