From patchwork Sun Jan 23 03:51:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33751 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1708860iog; Sat, 22 Jan 2022 19:52:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJztjypf0UiJH87toeNEqaFbVNIOtVGykvy+mM3wwR6dy2vT4Uvba+n/9ib15pTNuklmDwod X-Received: by 2002:a17:907:6298:: with SMTP id nd24mr8526883ejc.224.1642909964142; Sat, 22 Jan 2022 19:52:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642909964; cv=none; d=google.com; s=arc-20160816; b=Aq+tPe/E+egFGAobhJlcQIlKVw7FyhOjvNkiS7NCfFBjHGO0rtpJj6IvMGX19lhtOD CljdOGjyuVsjZNGf+VcgP4Sw74gR4CAyJm+scFh3AJFCmCCsOykPoIwk5PFdrSPj5D3v WamhMwURJmW82SQrZ/ytoO12zUvs4VOIPYNQ2QsHQQT/0XPX7VXsSZnfcOLPuHwFDMVS xqk8gPmF20bO0EFO5kugBgn5cSAPsOY4n0v9mdKKhspeB7CQLWg7PUWvhXPpthFroRwc hhGtjswnGR3nkU5OQ1NJBa9Ls0r+fcTZs5aNyG5BCCOBx5nqk12/KtgNhGSKt6hyPnYb iI/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=FCYumaYyGqBZNqDdMgtyX0OOkrZFZdIz1b9wV/Wa5xk=; b=qM3B45V4I+0bhA5dv1P5/Z2OHfK6z8/NJT6PIaXRHHuy7w3AFKkSuPifeXjDnoONCa FRXf8abcq9qEZkf7VfSPI8sCULvhxMumZaFuQtTkQSuiFKeMk/WwRbsfUr22Ptqce3qD whfJL0KfAaaDZxxoY16rQWLUEcTIzvUF3khAK5Wq4jAvSba/6erKsVAJb7QZL0+7Yyzq mS5esJ0gXD+cd9l6aT3prlrREBYfmgWXeSfB2mSOJS/4FrkEMXtO34nS505JHnz96HSc BFZ78OBvWOEr/yGebJUDOM06m5cqD0/elMc34uINC6xFkC8zGRvSgWKnVlMyUGgoUta9 RS0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l8bvqefo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e2si5920172ejm.387.2022.01.22.19.52.43; Sat, 22 Jan 2022 19:52:44 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=l8bvqefo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72AA368AEC5; Sun, 23 Jan 2022 05:52:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A50A068AFB4 for ; Sun, 23 Jan 2022 05:52:16 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id c3so12393834pls.5 for ; Sat, 22 Jan 2022 19:52:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4lLfiQUyloMKmE3g4j+9BUDFmshtjkDQA1amULzkfaw=; b=l8bvqefoCnbHFTBbq6VoROmgUfhls/wd0PsvOB3UjR8s3TJhxa/0bfn7IGuQ0P+v24 SbTuYke83szqMHjpq+P/y0Llu72GLG22jQ0o2ErGPl/+X2TgWaeB6N8YpOTUk0KYI473 bkoPsFuOR5g56WKzM36QiTqDx6XmSWD7orq9odeIb7LotrWvYYe8wqmOruveZli7UKE5 GGhUMXxEFXpfTzcYTvqBOkK3p1c2+3DRmUIoN6AnXIOjcafJknezvmUtWQ0nZgSxUwuA YRf8K0rL78MopDKeNhuuez9Ufcuf/LmauA1+LDumfh1NHCIWseN87cfzZ+sX038LClmW EwhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4lLfiQUyloMKmE3g4j+9BUDFmshtjkDQA1amULzkfaw=; b=0seu+Hk7p3hDoaeJw/dwPD6dy8lmFOwljmbTlDJ6pwOH6rN5lZpBXrXjeh8pcInxIp uc5ihL9/Zy4s6O43eO4UGZg8fHhI+oBPuLKoffujXy8e6Z7/FZeQ+WYqqOrjBdKJXu6m d0CWBtvGYTF0812xgpr+6To34OZ9Exv6a+aPnO99q9GK9b4kvS/zau1kmCKNEtC1kCI7 GrUPjx7L6BljyrIBTD5TcdHyCV+3zY7n7Yc8Ti6e8Mxu/Hvb7lITsUB/PVYclJU1S7K0 IdTJMBScy8twb3MJOEB+O3zmhogvj7jyYeYbt0OK3Nm3MqgNZVTU1WvVEkwG7TFPzZmp XKZw== X-Gm-Message-State: AOAM530icuVzDNoSh/jqok0/8stbHCj2JOqHZcgLrDTKWSzjU9nBPGXj kklE2t4JwKyHN9xbnfEDTG3Zucu+5ZQ= X-Received: by 2002:a17:902:6502:b0:149:1162:f0b5 with SMTP id b2-20020a170902650200b001491162f0b5mr9703505plk.126.1642909934960; Sat, 22 Jan 2022 19:52:14 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id f13sm12015747pfc.70.2022.01.22.19.52.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jan 2022 19:52:14 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Jan 2022 11:51:58 +0800 Message-Id: <1642909918-26903-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1642909918-26903-1-git-send-email-lance.lmwang@gmail.com> References: <1642909918-26903-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avformat/dashdec: avoid calling strlen multiple times X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jTudNc2VrRfm From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dashdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0d21989..211d77f 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -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)) { @@ -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)) { @@ -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;