summaryrefslogtreecommitdiff
path: root/src/protocol
diff options
context:
space:
mode:
authorcyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2009-10-20 04:34:03 +0000
committercyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>2009-10-20 04:34:03 +0000
commit0b3824c86a99354d06339b95e40515de762d65f7 (patch)
tree133edb1fb478a97674cb63e1f89a4762053d24e2 /src/protocol
parent0d3ec454de486da5cbc292f7e694ee8ab7e4fae0 (diff)
Apply some changes based on possible "flaws" found with flawfinder.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2574 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/protocol')
-rw-r--r--src/protocol/inspircd11.c6
-rw-r--r--src/protocol/inspircd12.cpp8
-rw-r--r--src/protocol/unreal32.c6
3 files changed, 10 insertions, 10 deletions
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 7d2044706..c6740f561 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -154,7 +154,7 @@ static char currentpass[1024];
/* PASS */
void inspircd_cmd_pass(const char *pass)
{
- strncpy(currentpass, pass, 1024);
+ strlcpy(currentpass, pass, sizeof(currentpass));
}
@@ -568,8 +568,8 @@ int anope_event_fjoin(const char *source, int ac, const char **av)
}
}
}
- strncat(nicklist, prefixandnick, 513);
- strncat(nicklist, " ", 513);
+ strlcat(nicklist, prefixandnick, sizeof(nicklist));
+ strlcat(nicklist, " ", sizeof(nicklist));
delete [] curnick_real;
nlen = 0;
}
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index bdc6e999a..0f4d7c42f 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -159,7 +159,7 @@ static char currentpass[1024];
/* PASS */
void inspircd_cmd_pass(const char *pass)
{
- strncpy(currentpass, pass, 1024);
+ strlcpy(currentpass, pass, sizeof(currentpass));
}
@@ -645,8 +645,8 @@ int anope_event_fjoin(const char *source, int ac, const char **av)
// Much as I hate goto.. I can't `break 2' to get here.. XXX ugly
endnick:
- strncat(nicklist, prefixandnick, 513);
- strncat(nicklist, " ", 513);
+ strlcat(nicklist, prefixandnick, sizeof(nicklist));
+ strlcat(nicklist, " ", sizeof(nicklist));
delete [] curnick_real;
nlen = 0;
}
@@ -901,7 +901,7 @@ int anope_event_uid(const char *source, int ac, const char **av)
Server *s = findserver_uid(servlist, source);
uint32 *ad = reinterpret_cast<uint32 *>(&addy);
int ts = strtoul(av[1], NULL, 10);
-
+
/* Check if the previously introduced user was Id'd for the nickgroup of the nick he s currently using.
* If not, validate the user. ~ Viper*/
user = prev_u_intro;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 34efa0f00..5c50dc8cd 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -822,7 +822,7 @@ int anope_event_sethost(const char *source, int ac, const char **av)
/* If a user has a custom host and a server splits and reconnects
* Unreal does not send the users cloaked host to Anope.. so we do not know it.
- * However, they will be +t if this is the case, so we will set their vhost
+ * However, they will be +t if this is the case, so we will set their vhost
* to the sethost value (which really is their vhost) and clear the chost.
* The chost will be request later (if needed) - Adam
*/
@@ -1024,7 +1024,7 @@ int anope_event_userhost(const char *source, int ac, const char **av)
*/
if (ac < 2 || !av[1] || !*av[1])
return MOD_CONT;
-
+
std::string reply = av[1];
std::string user = std::string(reply.begin(), std::find(reply.begin(), reply.end(), '='));
if (user[user.length() - 1] == '*')
@@ -1130,7 +1130,7 @@ bool ChannelModeFlood::IsValid(const char *value)
if (*value != ':' && strtoul((*value == '*' ? value + 1 : value), &dp, 10) > 0 && *dp == ':' && *(++dp) && strtoul(dp, &end, 10) > 0 && !*end) return 1;
else {
/* '['<number><1 letter>[optional: '#'+1 letter],[next..]']'':'<number> */
- strncpy(xbuf, value, sizeof(xbuf));
+ strlcpy(xbuf, value, sizeof(xbuf));
p2 = strchr(xbuf + 1, ']');
if (!p2) return 0;
*p2 = '\0';