Skip to content

[release/6.0] [wasm][debugger] Avoid exception when calling WhenAny with a null parameter #76900

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

Closed
thaystg wants to merge 1 commit into from
Closed

[release/6.0] [wasm][debugger] Avoid exception when calling WhenAny with a null parameter #76900

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
3 changes: 2 additions & 1 deletion src/mono/wasm/debugger/BrowserDebugProxy/DevToolsProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ private async Task<string> ReadOne(WebSocket socket, CancellationToken token)
WebSocketReceiveResult result = await socket.ReceiveAsync(new ArraySegment<byte>(buff), token);
if (result.MessageType == WebSocketMessageType.Close)
{
Log("error", $"DevToolsProxy: Client initiated close: {result.CloseStatus.Value} - {result.CloseStatusDescription}");
client_initiated_close.TrySetResult();
return null;
}
Expand Down Expand Up @@ -257,7 +258,7 @@ public async Task Run(Uri browserUri, WebSocket ideSocket)
{
while (!x.IsCancellationRequested)
{
Task task = await Task.WhenAny(pending_ops.ToArray());
Task task = await Task.WhenAny(pending_ops.Where(i => i != null).ToArray());

if (client_initiated_close.Task.IsCompleted)
{
Expand Down