From patchwork Mon Sep 16 01:03:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15082 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 0581F4495F2 for ; Mon, 16 Sep 2019 04:03:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D8816687F9C; Mon, 16 Sep 2019 04:03:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B03CF687F2D for ; Mon, 16 Sep 2019 04:03:47 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id y22so21889344pfr.3 for ; Sun, 15 Sep 2019 18:03:47 -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; bh=QLok3jz/KHWWUky9cDyDSOrWK9cgLvgkLjQKhPkhFgk=; b=DTw6+7DCTsmna6nNgpALqPTdXNVrSSS01H/LCefEIcyKe7GWpdftEXNA2D2VzHJLxE 7wryCVDIUDR36VM9qTE/KLde4oAOfso1Vyn7y+yIPAsoQkHZtYjuiExcAszkCWv8KSWZ ipeQB2jQAgLYzzd7gbqwKYgZxekqDYi4PbL8STXbzApGkJbvjlDFvkZq3g0EuPyAVFXx 43hMBcRzpyF5FoA+Yl+G1Az0h/ypX/j2QkN7cAjMuwjlFB6v+n0PqUJjJVuB7P8w3/YB e3FCPLF+goX9LCYKSDzOSfU260Dgje7yXFbFZTqPNAC54IOUOp/2QgymtGnuwogz4r/x B6iQ== 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; bh=QLok3jz/KHWWUky9cDyDSOrWK9cgLvgkLjQKhPkhFgk=; b=nftsvz0di1h4n68mEXRfgzk6qKiSDasY9n58lPbFXE/pntsQsWdq7ZVG+ycM9zrIzr oU4y5ZM/EgoTmKHuMHX/C/KHmA4PA2PqIopXo8vzrdDkdqL8WOO0bC64xULaQw3o7KRy IoMw66ZxFbe0fve2MwLTYbNwidGmI0Hq3xVqVeVSI8VMR0OQU0gDcxuhRc0lvZhkYk2O q07dx/JawDsLNmodZfqsFkjISzR4ZTlKQMozNuC9DfhGE9xAW+XFsifMQ8OgHzWn6r9i LzHMud0NcevgVcWFIXMrujduKtdmwtsIuu5F0dh/P4V21g2/DtBhG5DZA+NqEYS4R0KQ zqag== X-Gm-Message-State: APjAAAVFJxjpGsJUBCd42uDw+dg08wIG6IyesIvk7T/lhCz66eOSsu08 gGCfGIZfJmqdfLSAkNhDMreV/yHB X-Google-Smtp-Source: APXvYqwG1QEIly/EdTOk1bc68BkgLIKXaMPRuaIv+gs043MgqvNPOszlmo5eQcXieIxevYhGLXmeOA== X-Received: by 2002:a63:c05:: with SMTP id b5mr12222523pgl.415.1568595825509; Sun, 15 Sep 2019 18:03:45 -0700 (PDT) Received: from vpn2.localdomain ([47.90.123.189]) by smtp.gmail.com with ESMTPSA id a17sm2797218pfi.178.2019.09.15.18.03.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Sep 2019 18:03:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Sep 2019 09:03:35 +0800 Message-Id: <1568595818-7943-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH v1 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang 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..9fddd0c77b 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 = NULL; + + 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 != NULL ? strrchr(path, '/') : NULL; #if HAVE_DOS_PATHS - char *q = strrchr(path, '\\'); - char *d = strchr(path, ':'); + char *q = path != NULL ? strrchr(path, '\\') : NULL; + char *d = path != NULL ? 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);