[Mesa-dev] [PATCH 8/9] ralloc: Use strnlen() inside of strncat()

[Timothy Arceri]

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

I've pushed all the ones that had a previous r-b and added mine.

On 22/05/17 06:49, Thomas Helland wrote:
> From: Vladislav Egorov <vegorov180 at gmail.com>
> 
> If the str is long or isn't null-terminated, strlen() could take a lot
> of time or even crash. I don't know why was it used in the first place,
> maybe for platforms without strnlen(), but strnlen() is already used
> inside of ralloc_strndup(), so this change should not additionally
> break anything.
> 
> Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>   src/util/ralloc.c | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/src/util/ralloc.c b/src/util/ralloc.c
> index 7bf192e0db..953f36e6bc 100644
> --- a/src/util/ralloc.c
> +++ b/src/util/ralloc.c
> @@ -405,12 +405,7 @@ ralloc_strcat(char **dest, const char *str)
>   bool
>   ralloc_strncat(char **dest, const char *str, size_t n)
>   {
> -   /* Clamp n to the string length */
> -   size_t str_length = strlen(str);
> -   if (str_length < n)
> -      n = str_length;
> -
> -   return cat(dest, str, n);
> +   return cat(dest, str, strnlen(str, n));
>   }
>   
>   char *
>