adding null check on provider registration

fix dotnet#45599
ovebastiansen · Dec 12, 2020 · 29a9add · 29a9add
1 parent 51333a0
commit 29a9add
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/libraries/Microsoft.Extensions.Logging/src/LoggerFactory.cs b/src/libraries/Microsoft.Extensions.Logging/src/LoggerFactory.cs
@@ -152,6 +152,11 @@ public void AddProvider(ILoggerProvider provider)
                 throw new ObjectDisposedException(nameof(LoggerFactory));
             }
 
+            if (provider == null)
+            {
+                throw new ArgumentNullException(nameof(provider));
+            }
+
             lock (_sync)
             {
                 AddProviderRegistration(provider, dispose: true);

diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerFactoryTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/Common/LoggerFactoryTest.cs
@@ -23,6 +23,14 @@ public void AddProvider_ThrowsAfterDisposed()
             Assert.Throws<ObjectDisposedException>(() => ((ILoggerFactory) factory).AddProvider(CreateProvider()));
         }
 
+        [Fact]
+        public void AddProvider_ThrowsIfProviderIsNull()
+        {
+            var factory = new LoggerFactory();
+
+            Assert.Throws<ArgumentNullException>(() => ((ILoggerFactory)factory).AddProvider(null));
+        }
+
         [Fact]
         public void CreateLogger_ThrowsAfterDisposed()
         {