philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use of uninitialised variable and hostmask matching logic in userhost_unban()

Browse Source 
Initialise ip_str so that it isn't used uninitialised.

Don't strip server flags from user@ portion of the hostmask, so that it will
not miss matching bans.

Switch ip_str from alloca() to malloc_sprintf() / new_free() - there's no
particular need for alloca() here.
This commit is contained in:
Kevin Easton
2015-06-23 15:53:30 +10:00
parent 3618f842aa
commit 05cf540a99
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@@ -1,5 +1,8 @@
[Changes 1.2.2] [Changes 1.2.2]
* Fix potential crash in /unban, and change it so that it correctly matches
the user@ portion of the hostmask.
* Clean up the build by fixing up the (unsigned char *) / (char *) mismatches * Clean up the build by fixing up the (unsigned char *) / (char *) mismatches
that the compiler warns about. (caf) that the compiler warns about. (caf)

16
source/banlist.c
View File

@@ -302,7 +302,7 @@ void userhost_unban(UserhostItem *stuff, char *nick1, char *args)
BanList *bans; BanList *bans;
WhowasList *whowas; WhowasList *whowas;
NickList *n = NULL; NickList *n = NULL;
char *tmp, *channel, *ip_str, *host = NULL; char *channel, *ip_str = NULL, *host = NULL;
int count = 0, old_server = from_server; int count = 0, old_server = from_server;
if (!stuff || !stuff->nick || !nick1 || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1)) if (!stuff || !stuff->nick || !nick1 || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1))
@@ -322,10 +322,7 @@ void userhost_unban(UserhostItem *stuff, char *nick1, char *args)
return; return;
} }
else else
{ malloc_sprintf(&host, "%s!%s@%s",stuff->nick, stuff->user, stuff->host);
tmp = clear_server_flags(stuff->user);
malloc_sprintf(&host, "%s!%s@%s",stuff->nick, tmp, stuff->host);
}
channel = next_arg(args, &args); channel = next_arg(args, &args);
if (args && *args) if (args && *args)
@@ -341,12 +338,8 @@ void userhost_unban(UserhostItem *stuff, char *nick1, char *args)
if (!n) if (!n)
n = find_nicklist_in_channellist(stuff->nick, chan, 0); n = find_nicklist_in_channellist(stuff->nick, chan, 0);
if (n && n->ip) if (n && n->ip)
{ malloc_sprintf(&ip_str, "%s!%s@%s", stuff->nick, stuff->user, n->ip);
size_t len = strlen(n->nick)+strlen(n->host)+strlen(n->ip)+10;
ip_str = alloca(len);
*ip_str = 0;
strmopencat(ip_str, len, stuff->nick, "!", stuff->user, "@", n->ip, NULL);
}
for (bans = chan->bans; bans; bans = bans->next) for (bans = chan->bans; bans; bans = bans->next)
{ {
if (!bans->sent_unban && (wild_match(bans->ban, host) || (ip_str && wild_match(bans->ban, ip_str))) ) if (!bans->sent_unban && (wild_match(bans->ban, host) || (ip_str && wild_match(bans->ban, ip_str))) )
@@ -361,6 +354,7 @@ void userhost_unban(UserhostItem *stuff, char *nick1, char *args)
if (!count) if (!count)
bitchsay("No match for Unban of %s on %s", nick1, args); bitchsay("No match for Unban of %s on %s", nick1, args);
new_free(&host); new_free(&host);
new_free(&ip_str);
from_server = old_server; from_server = old_server;
} }