1. ffmpeg
  2. Commit 834c9968a0c2ea47781c251af07846902ec1c491
Browse code

avcodec/ffwavesynth: Correct undefined overflow of PINK_UNIT

Fixes: signed integer overflow: 9223372036854775775 + 128 cannot be represented in type 'long'
Fixes: 20054/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFWAVESYNTH_fuzzer-5686385113825280

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 187161d62f35c8b613c4a6739b0a6dfa9a24da60)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Michael Niedermayer authored on 2020/01/18 07:42:08
Showing 1 changed files
libavcodec/ffwavesynth.c
History View file @ 834c996
... ... 
@@ -217,7 +217,7 @@ static void wavesynth_seek(struct wavesynth_context *ws, int64_t ts)
217 217 
     *last = -1;
218 218 
     lcg_seek(&ws->dither_state, (uint32_t)ts - (uint32_t)ws->cur_ts);
219 219 
     if (ws->pink_need) {
220 
-        uint64_t pink_ts_cur  = (ws->cur_ts + PINK_UNIT - 1) & ~(PINK_UNIT - 1);
220 
+        uint64_t pink_ts_cur  = (ws->cur_ts + (uint64_t)PINK_UNIT - 1) & ~(PINK_UNIT - 1);
221 221 
         uint64_t pink_ts_next = ts & ~(PINK_UNIT - 1);
222 222 
         int pos = ts & (PINK_UNIT - 1);
223 223 
         lcg_seek(&ws->pink_state, (uint32_t)(pink_ts_next - pink_ts_cur) * 2);