repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 51e5ba94b3f28f84aadc140f0c340d03d2a11d6c:
path_to: 
revision_to: 

commit 51e5ba94b3f28f84aadc140f0c340d03d2a11d6c
Author: Federico G. Schwindt 
Date:   Sat Apr 20 10:53:16 2013 +0100

    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

--- 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 {

-----END OF PAGE-----