Skip to content

ObjectFactory should verify against a null serviceProvider #82739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2023
Merged

ObjectFactory should verify against a null serviceProvider #82739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ActivatorUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion ...raries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ActivatorUtilitiesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using Microsoft.DotNet.RemoteExecutor;
using Xunit;
using static Microsoft.Extensions.DependencyInjection.Tests.AsyncServiceScopeTests;

namespace Microsoft.Extensions.DependencyInjection.Tests
{
Expand Down Expand Up @@ -91,6 +90,13 @@ public void TypeActivatorThrowsOnNullProvider()
Assert.Throws<ArgumentNullException>(() => ActivatorUtilities.CreateInstance<ClassWithABCS>(null, "hello"));
}

[Fact]
Copy link
Contributor

@steveharter steveharter Mar 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding the test

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()
{
Expand Down