From 0bf82a999a5fc87591215a0d3f2b125cd9258eec Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Mon, 11 Mar 2019 02:52:56 +0100 Subject: [PATCH] don't refuse to load databases with invalid times --- src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs b/src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs index 7dc0cfe0..d8e0199d 100644 --- 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