[Mesa-dev] [PATCH] util/disk_cache: fix d7b3707c612

[Jan Vesely]

On Sat, 2017-02-11 at 22:32 +1100, Timothy Arceri wrote:
> I forgot to error check stat() and also I wasn't using the subdir in
> is_two_character_sub_directory().

can you (mostly) swap title and description?
git id is better in Fixes: tag and makes title rather non-descriptive.

thanks,
Jan

> 
> Cc: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  src/util/disk_cache.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
> index 63954b2..84559ab 100644
> --- a/src/util/disk_cache.c
> +++ b/src/util/disk_cache.c
> @@ -509,10 +509,10 @@ is_regular_non_tmp_file(struct dirent *entry, const char *path)
>        return false;
>  
>     struct stat sb;
> -   stat(filename, &sb);
> +   int res = stat(filename, &sb);
>     free(filename);
>  
> -   if (!S_ISREG(sb.st_mode))
> +   if (res == -1 || !S_ISREG(sb.st_mode))
>        return false;
>  
>     size_t len = strlen (entry->d_name);
> @@ -556,10 +556,10 @@ is_two_character_sub_directory(struct dirent *entry, const char *path)
>        return false;
>  
>     struct stat sb;
> -   stat(path, &sb);
> +   int res = stat(subdir, &sb);
>     free(subdir);
>  
> -   if (!S_ISDIR(sb.st_mode))
> +   if (res == -1 || !S_ISDIR(sb.st_mode))
>        return false;
>  
>     if (strlen(entry->d_name) != 2)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170213/f7b11bd1/attachment.sig>