ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-11 11:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

core_whois Fix numeric 319 not obeying MaxLine

Browse Source
This commit is contained in:
Attila Molnar 2015-05-04 12:02:28 +02:00
parent 55477059cf
commit 68bb6a6745
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/coremods/core_whois.cpp
View File

@ -115,12 +115,15 @@ void CommandWhois::SplitChanList(WhoisContextImpl& whois, const std::string& cl)
std::string line(1, ':'); std::string line(1, ':');
std::string::size_type start, pos; std::string::size_type start, pos;
const std::string::size_type namelen = ServerInstance->Config->ServerName.length() + 6 + whois.GetTarget()->nick.length() + 1; // ":server.name 319 source target " ... "\r\n"
const std::string::size_type maxlen = ServerInstance->Config->Limits.MaxLine - 10 - ServerInstance->Config->ServerName.length() - whois.GetTarget()->nick.length() - whois.GetSource()->nick.length();
for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1) for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
{ {
if (line.length() + namelen + pos - start > 510) if (line.length() + pos - start > maxlen)
{ {
// Erase last ' ' and send
line.erase(line.length()-1);
whois.SendLine(319, line); whois.SendLine(319, line);
line.erase(1); line.erase(1);
} }
@ -130,6 +133,8 @@ void CommandWhois::SplitChanList(WhoisContextImpl& whois, const std::string& cl)
if (line.length() > 1) if (line.length() > 1)
{ {
// Erase last ' ' and send
line.erase(line.length()-1);
whois.SendLine(319, line); whois.SendLine(319, line);
} }
} }