ObjectFactory should verify against a null serviceProvider (#82739)

dotnet · Mar 15, 2023 · 32ebb66 · 32ebb66
1 parent aeed019
commit 32ebb66
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ActivatorUtilities.cs b/...libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ActivatorUtilities.cs
@@ -242,7 +242,7 @@ private static MethodInfo GetMethodInfo<T>(Expression<T> expr)
             return service;
         }
 
-        private static NewExpression BuildFactoryExpression(
+        private static BlockExpression BuildFactoryExpression(
             ConstructorInfo constructor,
             int?[] parameterMap,
             Expression serviceProvider,
@@ -281,7 +281,8 @@ private static NewExpression BuildFactoryExpression(
                 constructorArguments[i] = Expression.Convert(constructorArguments[i], parameterType);
             }
 
-            return Expression.New(constructor, constructorArguments);
+            return Expression.Block(Expression.IfThen(Expression.Equal(serviceProvider, Expression.Constant(null)), Expression.Throw(Expression.Constant(new ArgumentNullException(nameof(serviceProvider))))),
+                Expression.New(constructor, constructorArguments));
         }
 
 #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP

diff --git a/...raries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ActivatorUtilitiesTests.cs b/...raries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ActivatorUtilitiesTests.cs
@@ -4,7 +4,6 @@
 using System;
 using Microsoft.DotNet.RemoteExecutor;
 using Xunit;
-using static Microsoft.Extensions.DependencyInjection.Tests.AsyncServiceScopeTests;
 
 namespace Microsoft.Extensions.DependencyInjection.Tests
 {
@@ -91,6 +90,13 @@ public void TypeActivatorThrowsOnNullProvider()
             Assert.Throws<ArgumentNullException>(() => ActivatorUtilities.CreateInstance<ClassWithABCS>(null, "hello"));
         }
 
+        [Fact]
+        public void FactoryActivatorThrowsOnNullProvider()
+        {
+            var f = ActivatorUtilities.CreateFactory(typeof(ClassWithA), new Type[0]);
+            Assert.Throws<ArgumentNullException>(() => f(serviceProvider: null, null));
+        }
+
         [Fact]
         public void CreateInstance_ClassWithABCS_UsesTheLongestAvailableConstructor_ParameterOrderDoesntMatter()
         {