diff --git a/src/fold.c b/src/fold.c
index 0380516..cccc17e 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -1809,10 +1809,7 @@
 	    return;
 	STRCPY(newline, line);
 	if (p == NULL)
-	{
-	    STRNCPY(newline + line_len, marker, markerlen);
-	    newline[line_len + markerlen] = NUL;
-	}
+	    vim_strncpy(newline + line_len, marker, markerlen);
 	else
 	{
 	    STRCPY(newline + line_len, cms);