diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-20 07:06:04 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-26 07:48:10 +0200 |
commit | 7447045cc0dacf9eedf230070c0675eecf546ff6 (patch) | |
tree | eaef29c2ae99c7a9a4e560ad8170826567f96cd4 | |
parent | 36fa84e7ac805a774820d06b3d58e4e875cb11c9 (diff) |
avformat/webvttdec: Accept \r as newline
After parsing the end timestamp of a WebVTT cue block, the current code
skips everything after the start of the timestamp that is not a \t, ' '
or \n and treats what is next as the start of a WebVTT cue settings list.
Yet if there is no such list, but a single \r, this will skip a part of
the cue payload (namely everything until the first occurence of \t, ' '
or \n) and treat what has not been skipped as the beginning of the
WebVTT cue settings list that extends until the next \r or \n (or the
end).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r-- | libavformat/webvttdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c index bd3d45b382..8d2fdfed37 100644 --- a/libavformat/webvttdec.c +++ b/libavformat/webvttdec.c @@ -125,7 +125,7 @@ static int webvtt_read_header(AVFormatContext *s) break; /* optional cue settings */ - p += strcspn(p, "\n\t "); + p += strcspn(p, "\n\r\t "); while (*p == '\t' || *p == ' ') p++; settings = p; |