From ab65f7902f9e4aeda68e9797f1904f02d1f9fc35 Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Sat, 15 Dec 2012 19:41:58 +0100 Subject: m_ident Reject invalid and error replies --- src/modules/m_ident.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/modules/m_ident.cpp') diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp index 4d66a739e..f1c3b81fd 100644 --- a/src/modules/m_ident.cpp +++ b/src/modules/m_ident.cpp @@ -235,10 +235,16 @@ class IdentRequestSocket : public EventHandler */ ibuf[recvresult] = '\0'; std::string buf(ibuf); - std::string::size_type lastcolon = buf.rfind(':'); - if (lastcolon == std::string::npos) + + /* <2 colons: invalid + * 2 colons: reply is an error + * >3 colons: there is a colon in the ident + */ + if (std::count(buf.begin(), buf.end(), ':') != 3) return; + std::string::size_type lastcolon = buf.rfind(':'); + /* Truncate the ident at any characters we don't like, skip leading spaces */ for (std::string::const_iterator i = buf.begin()+lastcolon+1; i != buf.end(); ++i) { -- cgit v1.2.3