RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/microdvddec: skip malformed lines without frame number. 

Fixes: signed integer overflow: 1 - -9223372036854775808 cannot be represented in type 'long'
Fixes: 23490/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5133490093031424

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a8fb7612a9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-06-23 01:43:14 +02:00
parent 1f7af6a946
commit f62bbddde2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/microdvddec.c
View File

@ -94,6 +94,7 @@ static int microdvd_read_header(AVFormatContext *s)
int64_t pos = avio_tell(s->pb);
int len = ff_get_line(s->pb, line_buf, sizeof(line_buf));
char *line = line_buf;
int64_t pts;
if (!strncmp(line, bom, 3))
line += 3;
@ -136,13 +137,16 @@ static int microdvd_read_header(AVFormatContext *s)
SKIP_FRAME_ID;
if (!*p)
continue;
pts = get_pts(line);
if (pts == AV_NOPTS_VALUE)
continue;
sub = ff_subtitles_queue_insert(&microdvd->q, p, strlen(p), 0);
if (!sub) {
ret = AVERROR(ENOMEM);
goto fail;
}
sub->pos = pos;
sub->pts = get_pts(line);
sub->pts = pts;
sub->duration = get_duration(line);
}
ff_subtitles_queue_finalize(s, &microdvd->q);