Bring along a trailing null when guessing the path to the program under test

4 files changed, 4 insertions, 4 deletions

diff --git a/cat/test/main.c b/cat/test/main.c
index 54a7d01e..8c414da1 100644
--- a/cat/test/main.c
+++ b/cat/test/main.c
@@ -2659,7 +2659,7 @@ main(int argc, char **argv)
 			exit(1);
 		}
 		memmove(testprogdir + strlen(pwd) + 1, testprogdir,
-		    strlen(testprogdir));
+		    strlen(testprogdir) + 1);
 		memcpy(testprogdir, pwd, strlen(pwd));
 		testprogdir[strlen(pwd)] = '/';
 	}
diff --git a/cpio/test/main.c b/cpio/test/main.c
index b10ab1e4..58011274 100644
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -2660,7 +2660,7 @@ main(int argc, char **argv)
 			exit(1);
 		}
 		memmove(testprogdir + strlen(pwd) + 1, testprogdir,
-		    strlen(testprogdir));
+		    strlen(testprogdir) + 1);
 		memcpy(testprogdir, pwd, strlen(pwd));
 		testprogdir[strlen(pwd)] = '/';
 	}
diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 3cd8766b..b39c2bf7 100644
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -2658,7 +2658,7 @@ main(int argc, char **argv)
 			exit(1);
 		}
 		memmove(testprogdir + strlen(pwd) + 1, testprogdir,
-		    strlen(testprogdir));
+		    strlen(testprogdir) + 1);
 		memcpy(testprogdir, pwd, strlen(pwd));
 		testprogdir[strlen(pwd)] = '/';
 	}
diff --git a/tar/test/main.c b/tar/test/main.c
index d60a9dca..33a6364b 100644
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -2660,7 +2660,7 @@ main(int argc, char **argv)
 			exit(1);
 		}
 		memmove(testprogdir + strlen(pwd) + 1, testprogdir,
-		    strlen(testprogdir));
+		    strlen(testprogdir) + 1);
 		memcpy(testprogdir, pwd, strlen(pwd));
 		testprogdir[strlen(pwd)] = '/';
 	}