Skip to content

Add lock and null check to remoting internals (#16542) #16683

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
PaulHigin merged 3 commits into from
Jan 13, 2022
Merged

Add lock and null check to remoting internals (#16542) #16683

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35aaecf
fix crash Copy-Item to remote session (#16542)
sz-cayo Dec 30, 2021
6b6a69b
update comments
sz-cayo Jan 11, 2022
bb6be38
remove lock (#16542)
sz-cayo Jan 13, 2022
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
24 changes: 16 additions & 8 deletions src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,21 +220,29 @@ internal byte[] ReadOrRegisterCallback(OnDataAvailableCallback callback,
lock (_readSyncObject)
{
priorityType = DataPriorityType.Default;

// send data from which ever stream that has data directly.
// Send data from which ever stream that has data directly.
byte[] result = null;
result = _dataToBeSent[(int)DataPriorityType.PromptResponse].ReadOrRegisterCallback(_onSendCollectionDataAvailable);
priorityType = DataPriorityType.PromptResponse;
SerializedDataStream promptDataToBeSent = _dataToBeSent[(int)DataPriorityType.PromptResponse];
if (promptDataToBeSent is not null)
{
result = promptDataToBeSent.ReadOrRegisterCallback(_onSendCollectionDataAvailable);
priorityType = DataPriorityType.PromptResponse;
}

if (result == null)
{
result = _dataToBeSent[(int)DataPriorityType.Default].ReadOrRegisterCallback(_onSendCollectionDataAvailable);
priorityType = DataPriorityType.Default;
SerializedDataStream defaultDataToBeSent = _dataToBeSent[(int)DataPriorityType.Default];
if (defaultDataToBeSent is not null)
{
result = defaultDataToBeSent.ReadOrRegisterCallback(_onSendCollectionDataAvailable);
priorityType = DataPriorityType.Default;
}
}
// no data to return..so register the callback.

// No data to return..so register the callback.
if (result == null)
{
// register callback.
// Register callback.
_onDataAvailableCallback = callback;
}

Expand Down