Просмотр исходного кода

Fix to licensing crash because of overflowing date

Kenric Nugteren 4 недель назад
Родитель
Сommit
6f29b6bb53
1 измененных файлов с 26 добавлено и 1 удалено
  1. 26 1
      prs.server/Forms/DatabaseLicense/LicenseRenewalForm.xaml.cs

+ 26 - 1
prs.server/Forms/DatabaseLicense/LicenseRenewalForm.xaml.cs

@@ -93,7 +93,32 @@ public partial class LicenseRenewalForm : ThemableWindow, IDynamicEditorHost
 
     public DateTime NewExpiration
     {
-        get => RenewalDate.AddMonths(RenewalPeriod);
+        get
+        {
+            // Extra logic to prevent overflow of dates
+            if(RenewalPeriod > 0)
+            {
+                if(RenewalDate >= DateTime.MaxValue.AddMonths(-RenewalPeriod))
+                {
+                    return DateTime.MaxValue;
+                }
+                else
+                {
+                    return RenewalDate.AddMonths(RenewalPeriod);
+                }
+            }
+            else
+            {
+                if (RenewalDate <= DateTime.MinValue.AddMonths(-RenewalPeriod))
+                {
+                    return DateTime.MinValue;
+                }
+                else
+                {
+                    return RenewalDate.AddMonths(RenewalPeriod);
+                }
+            }
+        }
     }
 
     public List<LicenseTrackingItem> LicenseItems { get; private set; }