From 7b6436797c0d5ddbb290121ff9e1109faeccff0f Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Thu, 14 Jul 2016 14:09:50 +0200
Subject: blaze822: remaining fixes in new loop

---
 blaze822.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'blaze822.c')

diff --git a/blaze822.c b/blaze822.c
index 7572788..7794301 100644
--- a/blaze822.c
+++ b/blaze822.c
@@ -235,13 +235,12 @@ compress_hdr(char *s, char *end)
 			}
 			*t++ = *h++;
 		}
-		// zero fill gap
-		while (t < h)
-			*t++ = 0;
 		// remove trailing whitespace
-		t--;
 		while (s < t && isfws(t[-1]))
 			*--t = 0;
+		// zero fill gap
+		while (t < h)
+			*t++ = 0;
 	}
 }
 
@@ -277,7 +276,7 @@ unfold_hdr(char *buf, char *end)
 	}
 
 	while (s < end) {
-		s = memchr(s+1, '\n', end-buf);
+		s = memchr(s+1, '\n', end-s);
 		if (!s)
 			break;
 
@@ -293,6 +292,7 @@ unfold_hdr(char *buf, char *end)
 			}
 		}
 	}
+	compress_hdr(l, end);
 }
 
 struct message *
-- 
cgit 1.4.1