From patchwork Tue Sep 17 04:39:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15115 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5E2DE4473DB for ; Tue, 17 Sep 2019 07:39:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3762068819A; Tue, 17 Sep 2019 07:39:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B54C688154 for ; Tue, 17 Sep 2019 07:39:31 +0300 (EEST) Received: by mail-pg1-f180.google.com with SMTP id u17so1281687pgi.6 for ; Mon, 16 Sep 2019 21:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TfwfTrpuTnfzyRb8T4Ny8RHKiywH8clMtAZNOFfys5Y=; b=U+SJS8rOlEbCNmQ0F/sTQ2l19ESVCYV7qUfx64YdOci5F+QTwzFTCoOCrXLco7gemY W/kvhPDvl4DqfVYi2JuxNE1erxtPCCSLxDoi1rLINIcghnp8AnJng3UQjR+Z1lcHH1IN xECzEIj19Xi0//tcSKkQH77e/wb92q4zPd5bWNDW8Eto5DWONWxlNhQwz3qJp2nMgYpt klUZ0w7h4V2bWNUGhN6sTtyLBFy2aBnFzLobBd07VAoHJi+RXMblO3WKoHWLNODoh7da wn1JRCNVLBzE7wObRp61HqJjqofRUj514ZkKi9BB8Kc+5addXChB67CCuEWXwtyAKC8t ejNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TfwfTrpuTnfzyRb8T4Ny8RHKiywH8clMtAZNOFfys5Y=; b=oyqnHtI3s11llZQtIkvEJnP5PNhqnXU7QvyanD6vvNuWNLhuIP5CzGDB3g7EPSuBax rGkFFtBGCUeqMV3+SRbhvOwHCLhShIdjo4eGRKp4Yoyd5tPGw5u58ZqstqqIRl17xl1h z6GNZ8D3KKYOTKrpjtnv0IgIvJQn5am0WdzDnuBq0Dp6/sRy5dP00unT2Gq8v5Sj8RFt 9YmttnyKzH1zI7e5kfvfOA8ao7E/Wi9tMiMzwosXTfGqI83Ks5XuL0fQVEy1J5omKZjB 08sWyfkcLwBDSwjjEaV84KMQ0qMuwSpQf2Vr7o24FvnT6iL4h5liPfCn83+nubgAvZ7P u2LA== X-Gm-Message-State: APjAAAVBUa65++GFLy4zhpjIGfEilqv5M0+aZlb8JayHyONRTzDjoAag IEISr1vq/Hab/V6/sYM5raT7rMZa X-Google-Smtp-Source: APXvYqwBiFldUygQg1NrvpLOfQBeGDxhKkIOnEuJ6ryMqmHQcDbYsqhtwKqfx6D9MuXOrLWvMJPQYA== X-Received: by 2002:a17:90a:3847:: with SMTP id l7mr2948083pjf.118.1568695169012; Mon, 16 Sep 2019 21:39:29 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id r186sm950505pfr.40.2019.09.16.21.39.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Sep 2019 21:39:28 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Sep 2019 12:39:24 +0800 Message-Id: <20190917043924.32101-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190916193015.GN3219@michaelspb> References: <20190916193015.GN3219@michaelspb> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/4] avutil/avstring: support input path is a null pointer or empty string X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Reviewed-by: Tomas Härdin Reviewed-by: Liu Steven Signed-off-by: Limin Wang --- libavutil/avstring.c | 12 ++++++++---- libavutil/avstring.h | 13 +++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 4c068f5bc5..551ca5daee 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -257,8 +257,12 @@ char *av_strireplace(const char *str, const char *from, const char *to) const char *av_basename(const char *path) { - char *p = strrchr(path, '/'); + char *p; + + if (!path || *path == '\0') + return "."; + p = strrchr(path, '/'); #if HAVE_DOS_PATHS char *q = strrchr(path, '\\'); char *d = strchr(path, ':'); @@ -274,11 +278,11 @@ const char *av_basename(const char *path) const char *av_dirname(char *path) { - char *p = strrchr(path, '/'); + char *p = path ? strrchr(path, '/') : NULL; #if HAVE_DOS_PATHS - char *q = strrchr(path, '\\'); - char *d = strchr(path, ':'); + char *q = path ? strrchr(path, '\\') : NULL; + char *d = path ? strchr(path, ':') : NULL; d = d ? d + 1 : d; diff --git a/libavutil/avstring.h b/libavutil/avstring.h index 37dd4e2da0..274335cfb9 100644 --- a/libavutil/avstring.h +++ b/libavutil/avstring.h @@ -274,16 +274,21 @@ char *av_strireplace(const char *str, const char *from, const char *to); /** * Thread safe basename. - * @param path the path, on DOS both \ and / are considered separators. + * @param path the string to parse, on DOS both \ and / are considered separators. * @return pointer to the basename substring. + * If path does not contain a slash, the function returns a copy of path. + * If path is a NULL pointer or points to an empty string, a pointer + * to a string "." is returned. */ const char *av_basename(const char *path); /** * Thread safe dirname. - * @param path the path, on DOS both \ and / are considered separators. - * @return the path with the separator replaced by the string terminator or ".". - * @note the function may change the input string. + * @param path the string to parse, on DOS both \ and / are considered separators. + * @return A pointer to a string that's the parent directory of path. + * If path is a NULL pointer or points to an empty string, a pointer + * to a string "." is returned. + * @note the function may modify the contents of the path, so copies should be passed. */ const char *av_dirname(char *path);