Fix m_alias not initialising 'active' before use.

[user/henk/code/inspircd.git] / src / modules / m_svshold.cpp

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 8eecd377d22dbaea51b6e00c68a162027403adfc..0aaf113f0a21f58cbebe5f1e8a252099b3266d4e 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -76,7 +76,7 @@ class SVSHoldFactory : public XLineFactory
  public:
        SVSHoldFactory() : XLineFactory("SVSHOLD") { }
 
-       /** Generate a shun
+       /** Generate an SVSHOLD
        */
        XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE
        {
@@ -127,7 +127,12 @@ class CommandSvshold : public Command
                        if (parameters.size() < 3)
                                return CMD_FAILURE;
 
-                       unsigned long duration = InspIRCd::Duration(parameters[1]);
+                       unsigned long duration;
+                       if (!InspIRCd::Duration(parameters[1], duration))
+                       {
+                               user->WriteNotice("*** Invalid duration for SVSHOLD.");
+                               return CMD_FAILURE;
+                       }
                        SVSHold* r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 
                        if (ServerInstance->XLines->AddLine(r, user))
@@ -216,7 +221,7 @@ class ModuleSVSHold : public Module, public Stats::EventListener
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR);
+               return Version("Implements SVSHOLD. Like Q-lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR);
        }
 };