Fix potential off-by-one on large reads (thanks psychon)

[user/henk/code/inspircd.git] / src / commands / cmd_away.cpp

diff --git a/src/commands/cmd_away.cpp b/src/commands/cmd_away.cpp
index 7d2522304b8336bd89c298f4f8807c3fe789a821..d6f9189e79a20de25ae634e9cc80f68678e985b0 100644 (file)
--- a/src/commands/cmd_away.cpp
+++ b/src/commands/cmd_away.cpp
@@ -33,9 +33,9 @@ CmdResult CommandAway::Handle (const std::vector<std::string>& parameters, User
                        return CMD_FAILURE;
 
                user->awaytime = ServerInstance->Time();
-               strlcpy(user->awaymsg, parameters[0].c_str(), MAXAWAY);
+               user->awaymsg.assign(parameters[0], 0, ServerInstance->Config->Limits.MaxAway);
 
-               user->WriteNumeric(306, "%s :You have been marked as being away",user->nick);
+               user->WriteNumeric(306, "%s :You have been marked as being away",user->nick.c_str());
        }
        else
        {
@@ -44,8 +44,8 @@ CmdResult CommandAway::Handle (const std::vector<std::string>& parameters, User
                if (MOD_RESULT != 0 && !IS_LOCAL(user))
                        return CMD_FAILURE;
 
-               *user->awaymsg = 0;
-               user->WriteNumeric(305, "%s :You are no longer marked as being away",user->nick);
+               user->awaymsg.clear();
+               user->WriteNumeric(305, "%s :You are no longer marked as being away",user->nick.c_str());
        }
 
        return CMD_SUCCESS;