[FFmpeg-devel] [PATCH v1 1/4] avutil/avstring: support input path is a null pointer or empty string

[Liu Steven]

> 在 2019年9月16日，上午9:03，lance.lmwang at gmail.com 写道：
> 
> From: Limin Wang <lance.lmwang at gmail.com>
> 
> Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> ---
> 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;;
remove one ‘;'
> 
>     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);
> 
> -- 
> 2.21.0
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".