albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of unclever assert() in Send_Message_Mask() 

Either we use assert() to _guarantee_ a certain condition, or we use
if(...) to test for it. But never both.

So get rid of the assert() in Send_Message_Mask() and handle the case
that the target mask doesn't contain a dot (".") as regular error,
don't require the caller to assure that any more.

This polishes commit 5a312824.

Please note:
The test in Send_Message() is still _required_ to detect whether the
target is a channel (no dot) or a "target mask" (at least one dot)!
This commit is contained in:
Alexander Barton 2016-01-04 20:37:13 +01:00
parent afb59ab8e5
commit 4693226d69
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ngircd/irc.c
View File

@ -744,10 +744,7 @@ Send_Message_Mask(CLIENT * from, char * command, char * targetMask,
* dot (".") and no wildcards ("*", "?") following the last one. * dot (".") and no wildcards ("*", "?") following the last one.
*/ */
check_wildcards = strrchr(targetMask, '.'); check_wildcards = strrchr(targetMask, '.');
assert(check_wildcards != NULL); if (!check_wildcards || check_wildcards[strcspn(check_wildcards, "*?")]) {
if (check_wildcards &&
check_wildcards[strcspn(check_wildcards, "*?")])
{
if (!SendErrors) if (!SendErrors)
return true; return true;
return IRC_WriteErrClient(from, ERR_WILDTOPLEVEL, targetMask); return IRC_WriteErrClient(from, ERR_WILDTOPLEVEL, targetMask);