From: Federico G. Schwindt <fgsch@lodoss.net>
Date: Sat, 20 Apr 2013 09:53:16 +0000 (+0100)
Subject: Ensure there is enough space for the mask
X-Git-Tag: rel-21-rc1~102
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=51e5ba94b3f28f84aadc140f0c340d03d2a11d6c

Ensure there is enough space for the mask

As pointed by Alex while strl{cat,cpy} take the full length
we need to leave space to ensure a proper mask is always created
so revert the removal of - N from my last change.
---

diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index d98dc6c8..b0accd41 100644
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -279,16 +279,16 @@ Lists_MakeMask(const char *Pattern, char *mask, size_t len)
 
 	if (!at && !excl) {
 		/* Neither "!" nor "@" found: use string as nickname */
-		strlcpy(mask, Pattern, len);
+		strlcpy(mask, Pattern, len - 5);
 		strlcat(mask, "!*@*", len);
 	} else if (!at && excl) {
 		/* Domain part is missing */
-		strlcpy(mask, Pattern, len);
+		strlcpy(mask, Pattern, len - 3);
 		strlcat(mask, "@*", len);
 	} else if (at && !excl) {
 		/* User name is missing */
 		*at = '\0'; at++;
-		strlcpy(mask, Pattern, len);
+		strlcpy(mask, Pattern, len - 5);
 		strlcat(mask, "!*@", len);
 		strlcat(mask, at, len);
 	} else {