X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/beb93684818f1502aec2d8b0980d27257e1d36f4..1fb8ec4b0d871f44eeb025b2ea2a1fbfa961234b:/lib/compat.c

diff --git a/lib/compat.c b/lib/compat.c
index a783a01c..6dd2328a 100644
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -138,10 +138,9 @@
 	size_t len2 = strlen(s);
 	size_t ret = len1 + len2;
 
-	if (len1+len2 >= bufsize) {
-		len2 = bufsize - (len1+1);
-	}
-	if (len2 > 0) {
+	if (len1 < bufsize - 1) {
+		if (len2 >= bufsize - len1)
+			len2 = bufsize - len1 - 1;
 		memcpy(d+len1, s, len2);
 		d[len1+len2] = 0;
 	}