diff options
| author |  Attila Molnar | 2014-04-07 13:40:51 +0200 |
|---|---|---|
| committer | Attila Molnar | 2014-04-07 13:40:51 +0200 |
| commit | f71e6bf9cb41811f18864f5d4eecb26e29d03f25 (patch) | |
| tree | 88586e73f7ff864081b8831a88637680267b7201 /src/channels.cpp | |
| parent | m_override Deduplicate code (diff) | |
| parent | Release 2.0.16 (diff) | |
Merge insp20
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index c2060b90e..4555deb96 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -648,6 +648,7 @@ void Channel::UserList(User *user) */ bool has_user = this->HasUser(user); + const size_t maxlen = ServerInstance->Config->Limits.MaxLine - 10 - ServerInstance->Config->ServerName.size(); std::string prefixlist; std::string nick; for (UserMembIter i = userlist.begin(); i != userlist.end(); ++i) @@ -675,7 +676,7 @@ void Channel::UserList(User *user) if (nick.empty()) continue; - if (list.size() + prefixlist.length() + nick.length() + 1 > 480) + if (list.size() + prefixlist.length() + nick.length() + 1 > maxlen) { /* list overflowed into multiple numerics */ user->WriteNumeric(RPL_NAMREPLY, list); |