X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Flists.c;h=6faf311a74f767207c0f2c622cde44e72a924280;hb=5c6875d7686e1b4dbf1a82b6d159bd5f18da4a52;hp=4f57ca73521f6b65f568d0aefa9c60b844a685c6;hpb=6e28f4a7d13a81db99196da23958e81f2bb8418e;p=ngircd-alex.git diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 4f57ca73..6faf311a 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -147,10 +147,8 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil, strlcpy(newelem->mask, Mask, sizeof(newelem->mask)); if (Reason) { - newelem->reason = malloc(strlen(Reason) + 1); - if (newelem->reason) - strlcpy(newelem->reason, Reason, strlen(Reason) + 1); - else + newelem->reason = strdup(Reason); + if (!newelem->reason) Log(LOG_EMERG, "Can't allocate memory for new list reason text!"); } @@ -285,7 +283,7 @@ Lists_MakeMask(const char *Pattern) excl = NULL; if (!at && !excl) { - /* Neither "!" nor "@" found: use string as nick name */ + /* Neither "!" nor "@" found: use string as nickname */ strlcpy(TheMask, Pattern, sizeof(TheMask) - 5); strlcat(TheMask, "!*@*", sizeof(TheMask)); return TheMask;