diff options
Diffstat (limited to 'multimedia/ffmpeg/files/patch-CVE-2018-7751')
-rw-r--r-- | multimedia/ffmpeg/files/patch-CVE-2018-7751 | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/files/patch-CVE-2018-7751 b/multimedia/ffmpeg/files/patch-CVE-2018-7751 new file mode 100644 index 000000000000..7ad609ea77fd --- /dev/null +++ b/multimedia/ffmpeg/files/patch-CVE-2018-7751 @@ -0,0 +1,37 @@ +commit 3fa6e594a0f2575ddb6b2183961fde42ab5ab37b +Author: Michael Niedermayer <michael@niedermayer.cc> +Date: Sat Mar 10 01:40:36 2018 +0100 + + avformat/img2dec: fix infinite loop + + Fixes: kira-poc + + Found-by: Kira <kira_cxy@foxmail.com> + Change suggested by Kira + Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> + (cherry picked from commit a6cba062051f345e8ebfdff34aba071ed73d923f) + Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> +--- + libavformat/img2dec.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git libavformat/img2dec.c libavformat/img2dec.c +index ecf64eaffa..2585634e7c 100644 +--- libavformat/img2dec.c ++++ libavformat/img2dec.c +@@ -878,10 +878,14 @@ static int svg_probe(AVProbeData *p) + { + const uint8_t *b = p->buf; + const uint8_t *end = p->buf + p->buf_size; ++ + if (memcmp(p->buf, "<?xml", 5)) + return 0; + while (b < end) { +- b += ff_subtitles_next_line(b); ++ int inc = ff_subtitles_next_line(b); ++ if (!inc) ++ break; ++ b += inc; + if (b >= end - 4) + return 0; + if (!memcmp(b, "<svg", 4)) |