pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-26 13:56:38 +02:00
Code Activity

Fixed a crash if an invalid expiry time is given to a number of commands

Browse Source
This commit is contained in:
Adam
2010-10-13 14:46:53 -04:00
parent 5e9db23883
commit bc812eeb03
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/misc.cpp
+25 -21
View File
@@ -260,35 +260,39 @@ bool NumberList::InvalidRange(const Anope::string &)
*/
time_t dotime(const Anope::string &s)
{
int amount;
if (s.empty())
return -1;
int amount = 0;
Anope::string end;
amount = convertTo<int>(s, end, false);
if (!end.empty())
try
{
switch (end[0])
amount = convertTo<int>(s, end, false);
if (!end.empty())
{
case 's':
return amount;
case 'm':
return amount * 60;
case 'h':
return amount * 3600;
case 'd':
return amount * 86400;
case 'w':
return amount * 86400 * 7;
case 'y':
return amount * 86400 * 365;
default:
return -1;
switch (end[0])
{
case 's':
return amount;
case 'm':
return amount * 60;
case 'h':
return amount * 3600;
case 'd':
return amount * 86400;
case 'w':
return amount * 86400 * 7;
case 'y':
return amount * 86400 * 365;
default:
return -1;
}
}
}
else
return amount;
catch (const CoreException &) { }
return amount;
}
/*************************************************************************/