mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a message.arguments size check

Browse Source
This commit is contained in:
Florent Le Coz
2015-05-11 05:43:32 +02:00
parent cc1255d216
commit 763be827c9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.cpp
+5 -5
View File
@@ -411,13 +411,14 @@ void Bridge::send_irc_user_ping_request(const std::string& irc_hostname, const s
irc_responder_callback_t cb = [this, nick=utils::tolower(nick), iq_id, to_jid, irc_hostname, from_jid](const std::string& hostname, const IrcMessage& message) -> bool irc_responder_callback_t cb = [this, nick=utils::tolower(nick), iq_id, to_jid, irc_hostname, from_jid](const std::string& hostname, const IrcMessage& message) -> bool
{ {
if (irc_hostname != hostname) if (irc_hostname != hostname || message.arguments.size() < 2)
return false; return false;
IrcUser user(message.prefix); IrcUser user(message.prefix);
const std::string body = message.arguments[1]; const std::string body = message.arguments[1];
if (message.command == "NOTICE" && utils::tolower(user.nick) == nick && if (message.command == "NOTICE" && utils::tolower(user.nick) == nick
message.arguments.size() >= 2 && body.substr(0, 6) == "\01PING ") && body.substr(0, 6) == "\01PING ")
{ {
return false;
const std::string id = body.substr(6, body.size() - 7); const std::string id = body.substr(6, body.size() - 7);
if (id != iq_id) if (id != iq_id)
return false; return false;
@@ -425,8 +426,7 @@ void Bridge::send_irc_user_ping_request(const std::string& irc_hostname, const s
this->xmpp->send_iq_result(iq_id, to_jid, jid.local); this->xmpp->send_iq_result(iq_id, to_jid, jid.local);
return true; return true;
} }
if (message.command == "401" && message.arguments.size() >= 2 if (message.command == "401" && message.arguments[1] == nick)
&& message.arguments[1] == nick)
{ {
std::string error_message = "No such nick"; std::string error_message = "No such nick";
if (message.arguments.size() >= 3) if (message.arguments.size() >= 3)