mdadm/0022-Include-count-for-0-character-when-using-strncpy-to-.patch
ZhiqiangLiu d9f91ec4e1 mdadm: backport upstream patches
mdadm: backport upstream patches

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
2020-07-13 00:06:02 +08:00

35 lines
952 B
Diff

From d62151dfb6ec7f9ede978097421eeba82928710f Mon Sep 17 00:00:00 2001
From: Jes Sorensen <jsorensen@fb.com>
Date: Mon, 18 May 2020 20:19:53 -0400
Subject: [PATCH 22/27] Include count for \0 character when using strncpy to
implement strdup.
We have to include the \0 character in the length when copying a
string with strncpy() for which length was found with strlen().
Otherwise the destination will not get null terminated - except that
we explicitly zeroed it out earlier.
This quiets down the compiler's warnings.
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---
dlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlink.c b/dlink.c
index 3efa94b..69aa7aa 100644
--- a/dlink.c
+++ b/dlink.c
@@ -63,7 +63,7 @@ char *dl_strndup(char *s, int l)
if (s == NULL)
return NULL;
n = dl_newv(char, l+1);
- strncpy(n, s, l);
+ strncpy(n, s, l+1);
n[l] = 0;
return n;
}
--
2.21.1 (Apple Git-122.3)