From: Attila Molnar Date: Thu, 13 Mar 2014 14:41:10 +0000 (+0100) Subject: Fix NAMES list getting truncated on servers having an excessively long server name X-Git-Tag: v2.0.23~198 X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=5c96689b177ded5b864f848687ec98f922215276;hp=b18319769864542912bec9646986ef229a884bde;p=user%2Fhenk%2Fcode%2Finspircd.git Fix NAMES list getting truncated on servers having an excessively long server name --- diff --git a/src/channels.cpp b/src/channels.cpp index 73d408fb8..6c9bd7c85 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -783,6 +783,7 @@ void Channel::UserList(User *user) */ bool has_user = this->HasUser(user); + const size_t maxlen = MAXBUF - 10 - ServerInstance->Config->ServerName.size(); std::string prefixlist; std::string nick; for (UserMembIter i = userlist.begin(); i != userlist.end(); ++i) @@ -807,7 +808,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);