diff options
-rw-r--r-- | src/modules/m_ident.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
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) { |