Module Name: src
Committed By: rillig
Date: Wed Aug 12 03:27:29 UTC 2020
Modified Files:
src/usr.bin/make: make_malloc.c
Log Message:
make(1): in bmake_strndup, only scan the relevant part of the string
Just in case the given str is not really a string.
The POSIX 2018 documentation on strndup does not specify as clearly as
possible whether s has to be a string or whether raw memory is
acceptable as well. It only indirectly calls the s parameter of strndup
a string.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/make_malloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/make_malloc.c
diff -u src/usr.bin/make/make_malloc.c:1.12 src/usr.bin/make/make_malloc.c:1.13
--- src/usr.bin/make/make_malloc.c:1.12 Fri Jul 3 08:02:55 2020
+++ src/usr.bin/make/make_malloc.c Wed Aug 12 03:27:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make_malloc.c,v 1.12 2020/07/03 08:02:55 rillig Exp $ */
+/* $NetBSD: make_malloc.c,v 1.13 2020/08/12 03:27:29 rillig Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#ifdef MAKE_NATIVE
#include <sys/cdefs.h>
-__RCSID("$NetBSD: make_malloc.c,v 1.12 2020/07/03 08:02:55 rillig Exp $");
+__RCSID("$NetBSD: make_malloc.c,v 1.13 2020/08/12 03:27:29 rillig Exp $");
#endif
#include <stdio.h>
@@ -95,9 +95,9 @@ bmake_strndup(const char *str, size_t ma
if (str == NULL)
return NULL;
- len = strlen(str);
- if (len > max_len)
- len = max_len;
+ for (len = 0; len < max_len; len++)
+ if (str[len] == '\0')
+ break;
p = bmake_malloc(len + 1);
memcpy(p, str, len);
p[len] = '\0';
