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

Introduce strbegins() macro and replace all open-coded instances

Browse Source 
This test is done quite a bit across the tree, and the open-coded variants make it easy to have an
accidental mismatch between the length of the prefix being tested and the length actually passed to
strncmp().

This fixes an issue of that type comparing the server version against the prefix "u2.10", where the old
code used an incorrect length of 4.
This commit is contained in:
Kevin Easton
2017-06-06 23:47:10 +10:00
parent 09395464ff
commit 0a16ab16ac
14 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/notice.c
View File

@@ -69,11 +69,11 @@ static void handle_oper_vision(const char *from, const char *line)
int up_status = 0;
const unsigned long flags = get_server_ircop_flags(from_server);
if (!strncmp(line, "*** Notice -- ", 13))
if (strbegins(line, "*** Notice --"))
line += 14;
else if (!strncmp(line, "*** \002Notice\002 --", 15))
else if (strbegins(line, "*** \002Notice\002 --"))
line += 16;
else if (!strncmp(line, "*** ", 4))
else if (strbegins(line, "*** "))
line += 4;
/*
@@ -404,7 +404,7 @@ static void parse_server_notice(const char *from, char *line)
if (!f || !*f)
f = get_server_itsname(from_server);
if (*line != '*' && *line != '#' && strncmp(line, "MOTD ", 4))
if (*line != '*' && *line != '#' && !strbegins(line, "MOTD"))
flag = 1;
else
flag = 0;