diff options
| -rw-r--r-- | src/chanserv.c | 2 | ||||
| -rw-r--r-- | src/mail.c | 2 | ||||
| -rw-r--r-- | version.log | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/chanserv.c b/src/chanserv.c index 07ce73299..d6c8a6970 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1570,7 +1570,7 @@ int check_kick(User * user, char *chan, time_t chants) if (akick->flags & AK_ISNICK) get_idealban(ci, user, mask, sizeof(mask)); else - strcpy(mask, akick->u.mask); + strscpy(mask, akick->u.mask, sizeof(mask)); reason = akick->reason ? akick->reason : CSAutokickReason; goto kick; } diff --git a/src/mail.c b/src/mail.c index fccad34fe..c81d7776a 100644 --- a/src/mail.c +++ b/src/mail.c @@ -242,7 +242,7 @@ int MailValidate(const char *email) if (!email) return 0; - strcpy(copy, email); + strscpy(copy, email, sizeof(copy)); domain = strchr(copy, '@'); if (!domain) diff --git a/version.log b/version.log index 3731f94e1..b10f57537 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,11 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="3" VERSION_EXTRA="-svn" -VERSION_BUILD="2837" +VERSION_BUILD="2840" # $Log$ # Changes since 1.8.3 Release +#Revision 2840 - Fixed bug #1144 - replaced some strcpy calls with strscpy to be safer #Revision 2837 - Log deleting and clearing XOP access lists #Revision 2836 - Document usage of the -protocoldebug option in services help #Revision 2834 - Removed some unused functions from extern.h and changed docs/IRCD to not tell lies |