Validate zone argument in GetNextOccurrence

HangfireIO · Dec 26, 2023 · eb6fa12 · eb6fa12
1 parent d2978f4
commit eb6fa12
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/Cronos/CronExpression.cs b/src/Cronos/CronExpression.cs
@@ -233,6 +233,7 @@ public IEnumerable<DateTime> GetOccurrences(
         {
             if (fromUtc.Kind != DateTimeKind.Utc) ThrowWrongDateTimeKindException(nameof(fromUtc));
             if (fromUtc.Year > MaxYear) ThrowDateTimeExceedsMaxException(nameof(fromUtc));
+            if (zone == null) ThrowArgumentNullException(nameof(zone));
 
             if (ReferenceEquals(zone, UtcTimeZone))
             {
@@ -283,6 +284,7 @@ public IEnumerable<DateTime> GetOccurrences(
         public DateTimeOffset? GetNextOccurrence(DateTimeOffset from, TimeZoneInfo zone, bool inclusive = false)
         {
             if (from.Year > MaxYear) ThrowDateTimeExceedsMaxException(nameof(from));
+            if (zone == null) ThrowArgumentNullException(nameof(zone));
 
             if (ReferenceEquals(zone, UtcTimeZone))
             {
@@ -655,6 +657,12 @@ private static void ThrowDateTimeExceedsMaxException(string paramName)
             throw new ArgumentException($"The supplied DateTime is after the supported year of {MaxYear}.", paramName);
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ThrowArgumentNullException(string paramName)
+        {
+            throw new ArgumentNullException(paramName);
+        }
+
         private static bool GetBit(long value, int index)
         {
             return (value & (1L << index)) != 0;

diff --git a/tests/Cronos.Tests/CronExpressionFacts.cs b/tests/Cronos.Tests/CronExpressionFacts.cs
@@ -589,6 +589,15 @@ public void GetNextOccurrence_DateTimeTimeZone_ThrowsAnException_WhenFromGreater
             Assert.Equal("fromUtc", exception.ParamName);
         }
 
+        [Fact]
+        public void GetNextOccurrence_DateTimeTimeZone_ThrowsAnException_WhenZoneIsNull()
+        {
+            var exception = Assert.Throws<ArgumentNullException>(
+                () => CronExpression.EveryMinute.GetNextOccurrence(Today, null));
+
+            Assert.Equal("zone", exception.ParamName);
+        }
+
         [Fact]
         public void GetNextOccurrence_DateTimeOffset_ThrowsAnException_WhenToGreaterThanMaxYear()
         {
@@ -601,6 +610,15 @@ public void GetNextOccurrence_DateTimeOffset_ThrowsAnException_WhenToGreaterThan
             Assert.Equal("from", exception.ParamName);
         }
 
+        [Fact]
+        public void GetNextOccurrence_DateTimeOffsetTimeZone_ThrowsAnException_WhenZoneIsNull()
+        {
+            var exception = Assert.Throws<ArgumentNullException>(
+                () => CronExpression.EveryMinute.GetNextOccurrence(new DateTimeOffset(Today), null));
+
+            Assert.Equal("zone", exception.ParamName);
+        }
+
         [Theory]
         [InlineData(false)]
         [InlineData(true)]