From 2fbd45d643de4095b1476a716930dc920c2d1709 Mon Sep 17 00:00:00 2001 From: Alexander Luzgarev Date: Mon, 4 Mar 2019 22:04:06 +0100 Subject: [PATCH] Handle unrepresentable datetimes --- MatFileHandler.Tests/MatFileReaderTests.cs | 13 +++++++++++++ .../test-data/good/datetime-unrepresentable.mat | Bin 0 -> 520 bytes MatFileHandler/DatetimeAdapter.cs | 13 ++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 MatFileHandler.Tests/test-data/good/datetime-unrepresentable.mat diff --git a/MatFileHandler.Tests/MatFileReaderTests.cs b/MatFileHandler.Tests/MatFileReaderTests.cs index b317cf3..fd35342 100755 --- a/MatFileHandler.Tests/MatFileReaderTests.cs +++ b/MatFileHandler.Tests/MatFileReaderTests.cs @@ -449,6 +449,19 @@ namespace MatFileHandler.Tests Assert.That(duration[2], Is.EqualTo(new TimeSpan(1, 3, 5))); } + /// + /// Test unrepresentable datetime. + /// + [Test] + public void TestDatetime_Unrepresentable() + { + var matFile = GetTests("good")["datetime-unrepresentable"]; + var obj = matFile["d"].Value as IMatObject; + var datetime = new DatetimeAdapter(obj); + var d0 = datetime[0]; + Assert.That(d0, Is.Null); + } + private static AbstractTestDataFactory GetTests(string factoryName) => new MatTestDataFactory(Path.Combine(TestDirectory, factoryName)); diff --git a/MatFileHandler.Tests/test-data/good/datetime-unrepresentable.mat b/MatFileHandler.Tests/test-data/good/datetime-unrepresentable.mat new file mode 100644 index 0000000000000000000000000000000000000000..998807687907cc870b5649d985030f640f64e874 GIT binary patch literal 520 zcmeZu4DoSvQZUssQ1EpO(M`+DN!3vZ$Vn_o%P-2cQV4Jk_w+L}(NS?&W2{7Gv?%zR!VxtLX1Y1_6w_Mgq*s5TsFR(lH*^)MKRWXqz zVn>fVf6Z2S>3)O#;o&zeoy}M36Arw6&z$jU=7OX%0j6>a-<>}41V}hMO;k|bs3PdH zWLnCzWkyS$PBWMiVwfVfo5A(Z=OQi14UB4Q7OiLyyG%Z@o>lqX52x$>dGgyzjvZ*2b?(B~VuMN3 z{B|y^aaCYDsvyFkEW~D@ERxdCILSJ);D>x#Kf~0og+>p*iwjR-y>$IxgZ+JXg9Xd} Wb8KK1_<66n(dwrh3xipq&Q1W?`NJ{* literal 0 HcmV?d00001 diff --git a/MatFileHandler/DatetimeAdapter.cs b/MatFileHandler/DatetimeAdapter.cs index c86371f..cbc5e3f 100644 --- a/MatFileHandler/DatetimeAdapter.cs +++ b/MatFileHandler/DatetimeAdapter.cs @@ -57,6 +57,17 @@ namespace MatFileHandler /// /// Indices. /// Value converted to . - public DateTimeOffset this[params int[] list] => epoch.AddMilliseconds(data[Dimensions.DimFlatten(list)]); + public DateTimeOffset? this[params int[] list] + { + get + { + var milliseconds = data[Dimensions.DimFlatten(list)]; + if (milliseconds < -62_135_596_800_000.0 || milliseconds > 253_402_300_799_999.0) + { + return null; + } + return epoch.AddMilliseconds(milliseconds); + } + } } } \ No newline at end of file