From f3afcbecc63ec565a0386cda554d145ca908367d Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsalvez Date: Tue, 29 Sep 2015 16:10:02 +0200 Subject: [PATCH] util: use strnlen() in strndup() implementations If the string being copied is not NULL-terminated the result of strlen() is undefined. Signed-off-by: Samuel Iglesias Gonsalvez Reviewed-by: Neil Roberts Reviewed-by: Jose Fonseca --- src/util/ralloc.c | 5 +---- src/util/strndup.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/util/ralloc.c b/src/util/ralloc.c index 01719c888b1..e07fce74f23 100644 --- a/src/util/ralloc.c +++ b/src/util/ralloc.c @@ -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'; diff --git a/src/util/strndup.c b/src/util/strndup.c index ca1c6f53b57..5ceb32fe474 100644 --- a/src/util/strndup.c +++ b/src/util/strndup.c @@ -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; -- 2.30.2