]>
Commit | Line | Data |
---|---|---|
1fb5f65c | 1 | --- BitchX/source/names.c.orig Sat May 10 22:34:52 2003 |
2 | +++ BitchX/source/names.c Sat May 10 22:37:48 2003 | |
3 | @@ -12,7 +12,7 @@ | |
4 | ||
5 | ||
6 | #include "irc.h" | |
7 | -static char cvsrevision[] = "$Id$"; | |
8 | +static char cvsrevision[] = "$Id$"; | |
9 | CVS_REVISION(names_c) | |
10 | #include "struct.h" | |
11 | ||
12 | @@ -572,7 +572,7 @@ | |
13 | ||
14 | *nmodes = 0; | |
15 | *nargs = 0; | |
16 | - for (; *modes && strlen(nmodes) < sizeof(nmodes)-2; modes++) | |
17 | + for (; *modes && (strlen(nmodes) + 2) < sizeof nmodes; modes++) | |
18 | { | |
19 | isbanned = isopped = isvoiced = 0; | |
20 | switch (*modes) | |
21 | @@ -742,7 +742,8 @@ | |
22 | ||
23 | /* modes which can be done multiple times are added here */ | |
24 | ||
25 | - for (tucm = ucm; tucm && strlen(nmodes) < sizeof(nmodes)-2; tucm = tucm->next) | |
26 | + for (tucm = ucm; tucm && (strlen(nmodes) + 2) < sizeof nmodes; | |
27 | + tucm = tucm->next) | |
28 | { | |
29 | if (tucm->o_ed) | |
30 | { | |
31 | @@ -1003,7 +1004,7 @@ | |
32 | malloc_strcpy(key, next_arg(rest, &rest)); | |
33 | else | |
34 | { | |
35 | - if (rest && *key && !my_strnicmp(rest, *key, strlen(*key))) | |
36 | + if (rest && *key && (!my_strnicmp(rest, *key, strlen(*key)) || rest[0] == '*')) | |
37 | next_arg(rest, &rest); | |
38 | new_free(key); | |
39 | } |