From 07ce2a90b3322aefb67d7185f61a7d4f00036411 Mon Sep 17 00:00:00 2001 From: Sheldon Hearn Date: Mon, 25 Oct 1999 09:46:57 +0000 Subject: [PATCH] Do not rely on malloc() to zero-fill allocated memory, since it is not documented as doing so. This fixes a potential segmentation violation. PR: 14465 Reported by: Tony Finch --- usr.sbin/vipw/vipw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c index bf56eed4d631..8986ab3bc1bd 100644 --- a/usr.sbin/vipw/vipw.c +++ b/usr.sbin/vipw/vipw.c @@ -81,8 +81,9 @@ main(argc, argv) err(1, NULL); strcpy(masterpasswd, optarg); if (masterpasswd[strlen(masterpasswd) - 1] != '/') - masterpasswd[strlen(masterpasswd)] = '/'; - strcat(masterpasswd, _MASTERPASSWD); + strcat(masterpasswd, "/" _MASTERPASSWD); + else + strcat(masterpasswd, _MASTERPASSWD); if ((mppath = strdup(optarg)) == NULL) err(1, NULL); if (mppath[strlen(mppath) - 1] == '/')