X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=ws.c;h=59d0883c1f3a46edcbb2e45b172c9eac3b9d5e35;hb=c32056e0ef193002f80d75fd795e156ddf65c4ab;hp=819c797cf6f7a265c01f00033fa48fdab94a0943;hpb=7557b3431065bfdaaaa8fa3cab5a67a82fae7348;p=git.git

diff --git a/ws.c b/ws.c
index 819c797cf..59d0883c1 100644
--- a/ws.c
+++ b/ws.c
@@ -261,12 +261,11 @@ int ws_fix_copy(char *dst, const char *src, int len, unsigned ws_rule, int *erro
 	/*
 	 * Strip trailing whitespace
 	 */
-	if ((ws_rule & WS_TRAILING_SPACE) &&
-	    (2 <= len && isspace(src[len-2]))) {
-		if (src[len - 1] == '\n') {
+	if (ws_rule & WS_TRAILING_SPACE) {
+		if (0 < len && src[len - 1] == '\n') {
 			add_nl_to_tail = 1;
 			len--;
-			if (1 < len && src[len - 1] == '\r') {
+			if (0 < len && src[len - 1] == '\r') {
 				add_cr_to_tail = !!(ws_rule & WS_CR_AT_EOL);
 				len--;
 			}