projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix oplevel handling in bursts, fixing SF bugs #2596869 and #2597518.
[ircu2.10.12-pk.git]
/
ircd
/
m_burst.c
diff --git
a/ircd/m_burst.c
b/ircd/m_burst.c
index 262e247069f6ca1ec9382128dc3a29c93a8e6c16..f1e4429e32d0d0d9d273478240374f7abb6006f5 100644
(file)
--- a/
ircd/m_burst.c
+++ b/
ircd/m_burst.c
@@
-507,10
+507,18
@@
int ms_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
do {
level_increment = 10 * level_increment + *ptr++ - '0';
} while (IsDigit(*ptr));
do {
level_increment = 10 * level_increment + *ptr++ - '0';
} while (IsDigit(*ptr));
+ --ptr;
oplevel += level_increment;
oplevel += level_increment;
+ if (oplevel > MAXOPLEVEL) {
+ protocol_violation(sptr, "Invalid cumulative oplevel %u during burst", oplevel);
+ oplevel = MAXOPLEVEL;
+ break;
+ }
}
}
- else /* I don't recognize that flag */
+ else { /* I don't recognize that flag */
+ protocol_violation(sptr, "Invalid flag '%c' in nick part of burst", *ptr);
break; /* so stop processing */
break; /* so stop processing */
+ }
}
}
}
}
}
}
@@
-534,7
+542,7
@@
int ms_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
nickstr[nickpos++] = 'v';
if (current_mode & CHFL_CHANOP)
{
nickstr[nickpos++] = 'v';
if (current_mode & CHFL_CHANOP)
{
- if (
chptr->mode.apass[0]
)
+ if (
oplevel != MAXOPLEVEL
)
nickpos += ircd_snprintf(0, nickstr + nickpos, sizeof(nickstr) - nickpos, "%u", oplevel);
else
nickstr[nickpos++] = 'o';
nickpos += ircd_snprintf(0, nickstr + nickpos, sizeof(nickstr) - nickpos, "%u", oplevel);
else
nickstr[nickpos++] = 'o';
@@
-545,7
+553,7
@@
int ms_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
last_oplevel = oplevel;
}
last_oplevel = oplevel;
}
- if (
IsBurst(sptr) ||
!(member = find_member_link(chptr, acptr)))
+ if (!(member = find_member_link(chptr, acptr)))
{
add_user_to_channel(chptr, acptr, current_mode, oplevel);
if (!(current_mode & CHFL_DELAYED))
{
add_user_to_channel(chptr, acptr, current_mode, oplevel);
if (!(current_mode & CHFL_DELAYED))