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

12
source/ircaux.c
View File

@@ -2537,8 +2537,8 @@ int BX_figure_out_address (char *nuh, char **nick, char **user, char **host, cha
*/
else if (fourthback &&
(firstback - secondback == 3) &&
!strncmp(thirdback, ".k12.", 5) &&
!strncmp(firstback, ".us", 3))
strbegins(thirdback, ".k12.") &&
strbegins(firstback, ".us"))
{
*host = myhost;
*domain = fourthback;
@@ -2551,8 +2551,8 @@ int BX_figure_out_address (char *nuh, char **nick, char **user, char **host, cha
*/
else if (thirdback && !fourthback &&
(firstback - secondback == 3) &&
!strncmp(thirdback, ".k12.", 5) &&
!strncmp(firstback, ".us", 3))
strbegins(thirdback, ".k12.") &&
strbegins(firstback, ".us"))
{
*host = empty_string;
*domain = myhost;
@@ -2859,14 +2859,14 @@ char *BX_stripdev(char *ttynam)
return NULL;
#ifdef SVR4
/* unixware has /dev/pts012 as synonym for /dev/pts/12 */
if (!strncmp(ttynam, "/dev/pts", 8) && ttynam[8] >= '0' && ttynam[8] <= '9')
if (strbegins(ttynam, "/dev/pts") && ttynam[8] >= '0' && ttynam[8] <= '9')
{
static char b[13];
sprintf(b, "pts/%d", atoi(ttynam + 8));
return b;
}
#endif /* SVR4 */
if (!strncmp(ttynam, "/dev/", 5))
if (strbegins(ttynam, "/dev/"))
return ttynam + 5;
return ttynam;
}