Commit d078f39a authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/mpl2dec: Fix integer overflow with duration

Fixes: signed integer overflow: 9223372036854775807 - -1 cannot be represented in type 'long'
Fixes: 23167/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-6425051741290496

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9a42a67c5ca198a3879b7f3663cc44ccbcaf0bd3)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent e468d924
......@@ -55,7 +55,7 @@ static int mpl2_probe(const AVProbeData *p)
return AVPROBE_SCORE_MAX;
}
static int read_ts(char **line, int64_t *pts_start, int *duration)
static int read_ts(char **line, int64_t *pts_start, int64_t *duration)
{
char c;
int len;
......@@ -69,7 +69,10 @@ static int read_ts(char **line, int64_t *pts_start, int *duration)
}
if (sscanf(*line, "[%"SCNd64"][%"SCNd64"]%c%n",
pts_start, &end, &c, &len) >= 3) {
*duration = end - *pts_start;
if (end < *pts_start || end - (uint64_t)*pts_start > INT64_MAX) {
*duration = -1;
} else
*duration = end - *pts_start;
*line += len - 1;
return 0;
}
......@@ -97,7 +100,7 @@ static int mpl2_read_header(AVFormatContext *s)
const int64_t pos = avio_tell(s->pb);
int len = ff_get_line(s->pb, line, sizeof(line));
int64_t pts_start;
int duration;
int64_t duration;
if (!len)
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment