fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 17:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util: use strnlen() in strndup() implementations

Browse source 
If the string being copied is not NULL-terminated the result of
strlen() is undefined.

Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Samuel Iglesias Gonsalvez 2015-09-29 16:10:02 +02:00
parent 023165a734
commit f3afcbecc6
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/util/ralloc.c
View file

@ -359,10 +359,7 @@ ralloc_strndup(const void *ctx, const char *str, size_t max)
if (unlikely(str == NULL))
return NULL;
n = strlen(str);
if (n > max)
n = max;
n = strnlen(str, max);
ptr = ralloc_array(ctx, char, n + 1);
memcpy(ptr, str, n);
ptr[n] = '\0';

5
src/util/strndup.c
View file

@ -35,10 +35,7 @@ strndup(const char *str, size_t max)
if (!str)
return NULL;
n = strlen(str);
if (n > max)
n = max;
n = strnlen(str, max);
ptr = (char *) calloc(n + 1, sizeof(char));
if (!ptr)
return NULL;