diff options
| author | Clément Bœsch <u@pkh.me> | 2013-09-08 18:02:45 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2013-09-08 18:48:09 +0200 |
| commit | 90fc00a623de44e137fe1601b91356e8cd8bdd54 (patch) | |
| tree | 1673c23b8d12b4e706725aa739bd98e11dfc936c /libavformat/mpl2dec.c | |
| parent | cfcd55db164e0acc0c30b2cf084e6eebe9741d34 (diff) | |
avformat/subtitles: add a next line jumper and use it.
This fixes a bunch of possible overread in avformat with the idiom p +=
strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no
'\n' is found, so the +1 leads to an overread).
Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is
added because only the header is required for ff_subtitles_next_line().
Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite
loop in the probing since there is no more forced increment.
Diffstat (limited to 'libavformat/mpl2dec.c')
| -rw-r--r-- | libavformat/mpl2dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c index ffe1d83991..17b302ddfa 100644 --- a/libavformat/mpl2dec.c +++ b/libavformat/mpl2dec.c @@ -43,7 +43,7 @@ static int mpl2_probe(AVProbeData *p) if (sscanf(ptr, "[%"SCNd64"][%"SCNd64"]%c", &start, &end, &c) != 3 && sscanf(ptr, "[%"SCNd64"][]%c", &start, &c) != 2) return 0; - ptr += strcspn(ptr, "\n") + 1; + ptr += ff_subtitles_next_line(ptr); if (ptr >= ptr_end) return 0; } |