From: Matt Kraai <kraai@debian.org>
Date: Sun, 27 May 2001 14:11:52 +0000 (-0000)
Subject: Use safe_strncpy.
X-Git-Tag: 0_52~126
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6e9e136fcbd1883cf8a29d87b3825398587a3860;p=oweals%2Fbusybox.git

Use safe_strncpy.
---

diff --git a/editors/sed.c b/editors/sed.c
index 47fb63712..95be01822 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -388,9 +388,8 @@ static int parse_file_cmd(struct sed_cmd *sed_cmd, const char *filecmdstr)
 	/* the first non-whitespace we get is a filename. the filename ends when we
 	 * hit a normal sed command terminator or end of string */
 	filenamelen = strcspn(&filecmdstr[idx], "; \n\r\t\v\0");
-	sed_cmd->filename = xmalloc(sizeof(char) * filenamelen + 1);
-	strncpy(sed_cmd->filename, &filecmdstr[idx], filenamelen);
-	sed_cmd->filename[filenamelen] = 0;
+	sed_cmd->filename = xmalloc(filenamelen + 1);
+	safe_strncpy(sed_cmd->filename, &filecmdstr[idx], filenamelen + 1);
 
 	return idx + filenamelen;
 }
diff --git a/sed.c b/sed.c
index 47fb63712..95be01822 100644
--- a/sed.c
+++ b/sed.c
@@ -388,9 +388,8 @@ static int parse_file_cmd(struct sed_cmd *sed_cmd, const char *filecmdstr)
 	/* the first non-whitespace we get is a filename. the filename ends when we
 	 * hit a normal sed command terminator or end of string */
 	filenamelen = strcspn(&filecmdstr[idx], "; \n\r\t\v\0");
-	sed_cmd->filename = xmalloc(sizeof(char) * filenamelen + 1);
-	strncpy(sed_cmd->filename, &filecmdstr[idx], filenamelen);
-	sed_cmd->filename[filenamelen] = 0;
+	sed_cmd->filename = xmalloc(filenamelen + 1);
+	safe_strncpy(sed_cmd->filename, &filecmdstr[idx], filenamelen + 1);
 
 	return idx + filenamelen;
 }