From f77ccb8994db1105d6d2c11d5ec50e0c910e9ea1 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Sat, 18 Apr 2020 05:49:31 -0700 Subject: [PATCH] Fixed crash when in zone without adjustment rules --- BeefLibs/corlib/src/TimeZoneInfo.bf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BeefLibs/corlib/src/TimeZoneInfo.bf b/BeefLibs/corlib/src/TimeZoneInfo.bf index 5de3c433..37b98020 100644 --- a/BeefLibs/corlib/src/TimeZoneInfo.bf +++ b/BeefLibs/corlib/src/TimeZoneInfo.bf @@ -250,7 +250,9 @@ namespace System { TimeZoneInfo currentYear = GetCurrentOneYearLocal(); defer delete currentYear; AdjustmentRule rule = currentYear.m_adjustmentRules == null ? null : currentYear.m_adjustmentRules[0]; - oneYearLocFromUtc = new OffsetAndRule(year, currentYear.BaseUtcOffset, rule.Clone()); + if (rule != null) + rule = rule.Clone(); + oneYearLocFromUtc = new OffsetAndRule(year, currentYear.BaseUtcOffset, rule); m_oneYearLocalFromUtc = oneYearLocFromUtc; } return oneYearLocFromUtc;