summaryrefslogtreecommitdiff
path: root/src/helperfuncs.cpp
diff options
context:
space:
mode:
authorattilamolnar <attilamolnar@hush.com>2013-08-27 18:33:32 +0200
committerattilamolnar <attilamolnar@hush.com>2013-08-27 18:33:32 +0200
commit25ab5612f2ed8f0163c338740abd9f133af89356 (patch)
tree54f966dcdb994970fac4ad873c903ff3c834767b /src/helperfuncs.cpp
parent261d5bb566f6383efea99e73c933a2af6f408341 (diff)
Fix crash caused by passing a large integer to ctime()
In addition to verifying the return value of localtime(), correct tm_year if it is out of bounds Reported by @JDowny
Diffstat (limited to 'src/helperfuncs.cpp')
-rw-r--r--src/helperfuncs.cpp21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 5a8f55f11..439320c1e 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -495,7 +495,26 @@ bool InspIRCd::SilentULine(const std::string& sserver)
std::string InspIRCd::TimeString(time_t curtime)
{
- return std::string(ctime(&curtime),24);
+#ifdef _WIN32
+ if (curtime < 0)
+ curtime = 0;
+#endif
+
+ struct tm* timeinfo = localtime(&curtime);
+ if (!timeinfo)
+ {
+ curtime = 0;
+ timeinfo = localtime(&curtime);
+ }
+
+ // If the calculated year exceeds four digits or is less than the year 1000,
+ // the behavior of asctime() is undefined
+ if (timeinfo->tm_year + 1900 > 9999)
+ timeinfo->tm_year = 9999 - 1900;
+ else if (timeinfo->tm_year + 1900 < 1000)
+ timeinfo->tm_year = 0;
+
+ return std::string(asctime(timeinfo),24);
}
// You should only pass a single character to this.