Skip to content

Fix null reference exception for Streaming null object (#14004) #14515

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.

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
Oct 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,8 @@ await SendInvocationError(hubMethodInvocationMessage.InvocationId, connection,
for (var parameterPointer = 0; parameterPointer < arguments.Length; parameterPointer++)
{
if (hubMethodInvocationMessage.Arguments.Length > hubInvocationArgumentPointer &&
descriptor.OriginalParameterTypes[parameterPointer].IsAssignableFrom(hubMethodInvocationMessage.Arguments[hubInvocationArgumentPointer].GetType()))
(hubMethodInvocationMessage.Arguments[hubInvocationArgumentPointer] == null ||
descriptor.OriginalParameterTypes[parameterPointer].IsAssignableFrom(hubMethodInvocationMessage.Arguments[hubInvocationArgumentPointer].GetType())))
{
// The types match so it isn't a synthetic argument, just copy it into the arguments array
arguments[parameterPointer] = hubMethodInvocationMessage.Arguments[hubInvocationArgumentPointer];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,36 @@ public ChannelReader<int> CancelableStreamMultiParameter(int ignore, int ignore2
return channel.Reader;
}

public ChannelReader<int> CancelableStreamNullableParameter(int x, string y, CancellationToken token)
{
var channel = Channel.CreateBounded<int>(10);

Task.Run(async () =>
{
_tcsService.StartedMethod.SetResult(x);
await token.WaitForCancellationAsync();
channel.Writer.TryComplete();
_tcsService.EndMethod.SetResult(y);
});

return channel.Reader;
}

public ChannelReader<int> StreamNullableParameter(int x, int? input)
{
var channel = Channel.CreateBounded<int>(10);

Task.Run(() =>
{
_tcsService.StartedMethod.SetResult(x);
channel.Writer.TryComplete();
_tcsService.EndMethod.SetResult(input);
return Task.CompletedTask;
});

return channel.Reader;
}

public ChannelReader<int> CancelableStreamMiddleParameter(int ignore, CancellationToken token, int ignore2)
{
var channel = Channel.CreateBounded<int>(10);
Expand Down
58 changes: 58 additions & 0 deletions src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3591,6 +3591,64 @@ public async Task StreamHubMethodCanAcceptCancellationTokenAsArgumentAndBeTrigge
}
}

[Fact]
public async Task StreamHubMethodCanAcceptNullableParameter()
{
using (StartVerifiableLog())
{
var tcsService = new TcsService();
var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(builder =>
{
builder.AddSingleton(tcsService);
}, LoggerFactory);
var connectionHandler = serviceProvider.GetService<HubConnectionHandler<LongRunningHub>>();

using (var client = new TestClient())
{
var connectionHandlerTask = await client.ConnectAsync(connectionHandler).OrTimeout();

var streamInvocationId = await client.SendStreamInvocationAsync(nameof(LongRunningHub.StreamNullableParameter), 5, null).OrTimeout();
// Wait for the stream method to start
var firstArgument = await tcsService.StartedMethod.Task.OrTimeout();
Assert.Equal(5, firstArgument);

var secondArgument = await tcsService.EndMethod.Task.OrTimeout();
Assert.Null(secondArgument);
}
}
}


[Fact]
public async Task StreamHubMethodCanAcceptNullableParameterWithCancellationToken()
{
using (StartVerifiableLog())
{
var tcsService = new TcsService();
var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(builder =>
{
builder.AddSingleton(tcsService);
}, LoggerFactory);
var connectionHandler = serviceProvider.GetService<HubConnectionHandler<LongRunningHub>>();

using (var client = new TestClient())
{
var connectionHandlerTask = await client.ConnectAsync(connectionHandler).OrTimeout();

var streamInvocationId = await client.SendStreamInvocationAsync(nameof(LongRunningHub.CancelableStreamNullableParameter), 5, null).OrTimeout();
// Wait for the stream method to start
var firstArgument = await tcsService.StartedMethod.Task.OrTimeout();
Assert.Equal(5, firstArgument);

// Cancel the stream which should trigger the CancellationToken in the hub method
await client.SendHubMessageAsync(new CancelInvocationMessage(streamInvocationId)).OrTimeout();

var secondArgument = await tcsService.EndMethod.Task.OrTimeout();
Assert.Null(secondArgument);
}
}
}

[Fact]
public async Task InvokeHubMethodCannotAcceptCancellationTokenAsArgument()
{
Expand Down