| Message ID | 20220616231522.19275-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | d8ee01425459aaafe36acc7743b3f9f28a01821b |
| Headers | show |
| Series | [FFmpeg-devel] avformat/hls: Limit start_seq_no to one bit less | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
On Fri, Jun 17, 2022 at 01:15:22AM +0200, Michael Niedermayer wrote: > This avoids overflow checks on additions with 32bit numbers > > Fixes: signed integer overflow: 9223372036854775806 + 2 cannot be represented in type 'long' > Fixes: 44012/clusterfuzz-testcase-minimized-ffmpeg_dem_HLS_fuzzer-4747770734444544 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/hls.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) will apply [...]
diff --git a/libavformat/hls.c b/libavformat/hls.c index 8204f55df3..b736f093a9 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -837,10 +837,10 @@ static int parse_playlist(HLSContext *c, const char *url, if (ret < 0) goto fail; seq_no = strtoull(ptr, NULL, 10); - if (seq_no > INT64_MAX) { + if (seq_no > INT64_MAX/2) { av_log(c->ctx, AV_LOG_DEBUG, "MEDIA-SEQUENCE higher than " - "INT64_MAX, mask out the highest bit\n"); - seq_no &= INT64_MAX; + "INT64_MAX/2, mask out the highest bit\n"); + seq_no &= INT64_MAX/2; } pls->start_seq_no = seq_no; } else if (av_strstart(line, "#EXT-X-PLAYLIST-TYPE:", &ptr)) {
This avoids overflow checks on additions with 32bit numbers Fixes: signed integer overflow: 9223372036854775806 + 2 cannot be represented in type 'long' Fixes: 44012/clusterfuzz-testcase-minimized-ffmpeg_dem_HLS_fuzzer-4747770734444544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/hls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)