libcore: Validity check in date parsing

skyjake · Sep 1, 2019 · 4a6df08 · 4a6df08
1 parent bd3268e
commit 4a6df08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/doomsday/libs/core/include/de/data/time.h b/doomsday/libs/core/include/de/data/time.h
@@ -149,12 +149,12 @@ class DE_PUBLIC Time : public ISerializable
         SecondsSinceStart,
         BuildNumberAndSecondsSinceStart,
         FriendlyFormat,
-        ISODateOnly, // yyyy-MM-dd
+        ISODateOnly,      // yyyy-MM-dd
         CompilerDateTime, // Oct  7 2013 03:18:36 (__DATE__ __TIME__)
-        HumanDate, ///< human-entered date (only with Time::fromText)
+        HumanDate,        ///< human-entered date (only with Time::fromText)
         UnixLsStyleDateTime,
     };
-
+    
     using TimePoint = std::chrono::system_clock::time_point;
 
 public:

diff --git a/doomsday/libs/core/src/data/time.cpp b/doomsday/libs/core/src/data/time.cpp
@@ -531,7 +531,7 @@ Time Time::parse(const String &text, const char *format) // static
         }
         if (is.fail()) return Time::invalidTime();
     }
-
+    
     // Assume missing date values.
     if (year == 0)
     {
@@ -546,6 +546,10 @@ Time Time::parse(const String &text, const char *format) // static
         day = 1;
     }
 
+    // In the valid range?
+    if (month < 1 || month > 12) return Time::invalidTime();
+    if (day   < 1 || day   > 31) return Time::invalidTime();
+
     return Time(year, month, day, hour, minute, 0);
 }