From 82243d9beb827fca5708efe9e047ff2fec4bfe8c Mon Sep 17 00:00:00 2001 From: brain Date: Fri, 6 Oct 2006 09:09:27 +0000 Subject: Tidy up strlens which are not required git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5428 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_setident.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/modules/m_setident.cpp') diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp index 2bcdceeb1..d1f67bb14 100644 --- a/src/modules/m_setident.cpp +++ b/src/modules/m_setident.cpp @@ -15,14 +15,20 @@ class cmd_setident : public command_t CmdResult Handle(const char** parameters, int pcnt, userrec *user) { - for(unsigned int x = 0; x < strlen(parameters[0]); x++) + size_t len = 0; + for(const char* x = parameters[0]; *x; x++, len++) { - if(((parameters[0][x] >= 'A') && (parameters[0][x] <= '}')) || strchr(".-0123456789", parameters[0][x])) + if(((*x >= 'A') && (*x <= '}')) || strchr(".-0123456789", *x)) continue; - + user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick); return CMD_FAILURE; } + if (len > IDENTMAX) + { + user->WriteServ("NOTICE %s :*** Ident is too long", user->nick); + return CMD_FAILURE; + } user->ChangeIdent(parameters[0]); ServerInstance->WriteOpers("%s used SETIDENT to change their ident to '%s'", user->nick, user->ident); -- cgit v1.2.3