From 4296c369f6757e8fe8938dc02053309753075971 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Fri, 29 Jul 2016 18:26:39 +0200
Subject: blaze822: blaze822_hdr_: off-by-one for first header

---
 blaze822.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'blaze822.c')

diff --git a/blaze822.c b/blaze822.c
index 69f317d..3bdcbd9 100644
--- a/blaze822.c
+++ b/blaze822.c
@@ -418,10 +418,12 @@ blaze822_hdr_(struct message *mesg, const char *hdr, size_t hdrlen)
 		return 0;  // header too small for the key, probably empty
 
 	// special case: first header, no leading nul
-	if (memcmp(mesg->msg, hdr+1, hdrlen-1) == 0)
+	if (memcmp(mesg->msg, hdr+1, hdrlen-1) == 0) {
 		v = mesg->msg;
-	else
+		hdrlen--;
+	} else {
 		v = mymemmem(mesg->msg, mesg->end - mesg->msg, hdr, hdrlen);
+	}
 	if (!v)
 		return 0;
 	v += hdrlen;
-- 
cgit 1.4.1