From 029ff31af6801dd2bca1b543575e17eaaa6b0772 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Thu, 28 May 2020 10:41:25 +0800 Subject: [PATCH] avformat/url: check return value of strchr fix ticket: 8687 workflow should return if there have no value of strchr Signed-off-by: Steven Liu --- libavformat/url.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/url.c b/libavformat/url.c index 6956f6dc10..20463a6674 100644 --- a/libavformat/url.c +++ b/libavformat/url.c @@ -90,6 +90,8 @@ static void trim_double_dot_url(char *buf, const char *rel, int size) if (p && (sep = strstr(p, "://"))) { sep += 3; root = strchr(sep, '/'); + if (!root) + return; } /* set new current position if the root node is changed */ @@ -150,6 +152,7 @@ void ff_make_absolute_url(char *buf, int size, const char *base, } /* If rel actually is an absolute url, just copy it */ if (!base || strstr(rel, "://") || rel[0] == '/') { + memset(buf, 0, size); trim_double_dot_url(buf, rel, size); return; } @@ -177,6 +180,8 @@ void ff_make_absolute_url(char *buf, int size, const char *base, if (sep) { sep += 3; root = strchr(sep, '/'); + if (!root) + return; } }