Skip to content

Commit

Permalink
avformat/dashdec: avoid calling strlen multiple times
Browse files Browse the repository at this point in the history
Reviewed-by: Steven Liu <liuqi05@kuaishou.com>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
  • Loading branch information
lance-lmwang committed Jan 30, 2022
1 parent c825de8 commit 1530b3f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions libavformat/dashdec.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
DASHContext *c = s->priv_data;
AVDictionary *tmp = NULL;
const char *proto_name = NULL;
int proto_name_len;
int ret;

if (av_strstart(url, "crypto", NULL)) {
Expand All @@ -416,6 +417,7 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
if (!proto_name)
return AVERROR_INVALIDDATA;

proto_name_len = strlen(proto_name);
// only http(s) & file are allowed
if (av_strstart(proto_name, "file", NULL)) {
if (strcmp(c->allowed_extensions, "ALL") && !av_match_ext(url, c->allowed_extensions)) {
Expand All @@ -430,9 +432,9 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url,
} else
return AVERROR_INVALIDDATA;

if (!strncmp(proto_name, url, strlen(proto_name)) && url[strlen(proto_name)] == ':')
if (!strncmp(proto_name, url, proto_name_len) && url[proto_name_len] == ':')
;
else if (av_strstart(url, "crypto", NULL) && !strncmp(proto_name, url + 7, strlen(proto_name)) && url[7 + strlen(proto_name)] == ':')
else if (av_strstart(url, "crypto", NULL) && !strncmp(proto_name, url + 7, proto_name_len) && url[7 + proto_name_len] == ':')
;
else if (strcmp(proto_name, "file") || !strncmp(url, "file,", 5))
return AVERROR_INVALIDDATA;
Expand Down

0 comments on commit 1530b3f

Please sign in to comment.