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

1 files changed, 25 insertions, 21 deletions

diff --git a/src/misc.cpp b/src/misc.cpp
index 9e1599bf8..f9a8befc9 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -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;
 }
 
 /*************************************************************************/