From: Joerg Sonnenberger <joerg@bec.de>
Date: Sat, 29 Apr 2017 16:52:21 +0000 (+0200)
Subject: Optimize string processing.
X-Git-Tag: v3.3.2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc7ce6cbb30e5e489743bda22b9be83a44e78c05;p=thirdparty%2Flibarchive.git

Optimize string processing.
---

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 167455170..5beedd0d1 100644
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -1195,12 +1195,15 @@ mode_pass(struct cpio *cpio, const char *destdir)
 	struct lafe_line_reader *lr;
 	const char *p;
 	int r;
+	size_t destdir_len;
 
 	/* Ensure target dir has a trailing '/' to simplify path surgery. */
-	cpio->destdir = malloc(strlen(destdir) + 8);
-	strcpy(cpio->destdir, destdir);
-	if (destdir[strlen(destdir) - 1] != '/')
-		strcat(cpio->destdir, "/");
+	destdir_len = strlen(destdir);
+	cpio->destdir = malloc(destdir_len + 8);
+	memcpy(cpio->destdir, destdir, destdir_len);
+	if (destdir_len == 0 || destdir[destdir_len - 1] != '/')
+		cpio->destdir[destdir_len++] = '/';
+	cpio->destdir[destdir_len++] = '\0';
 
 	cpio->archive = archive_write_disk_new();
 	if (cpio->archive == NULL)