don't refuse to load databases with invalid times

2019-03-11 02:52:56 +01:00
parent bc917d41ad
commit 0bf82a999a
1 changed files with 9 additions and 2 deletions
--- a/src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs
+++ b/src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs
@@ -216,9 +216,16 @@ namespace keepass2android

 		private DateTime JavaTimeToCSharp(long javatime)
 		{
+		    try
+		    {
+		        var utcTime = new DateTime(1970, 1, 1).AddMilliseconds(javatime);
+		        return TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
+		    }
+		    catch (ArgumentOutOfRangeException)
+		    {
+		        return DateTime.MinValue;
+		    }
 			
-			var utcTime = new DateTime(1970, 1, 1).AddMilliseconds(javatime);
-			return TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);

 		}
 #endif