Skip to content

Fix SocketCommunicationManager null reference exception bug #2290

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
nohwnd merged 1 commit into from
Jan 13, 2020
Merged

Fix SocketCommunicationManager null reference exception bug #2290

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: 2 additions & 3 deletions src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionTestCaseEventSender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void SendTestCaseStart(TestCaseStartEventArgs e)
this.communicationManager.SendMessage(MessageType.DataCollectionTestStart, e);

var message = this.communicationManager.ReceiveMessage();
if (message.MessageType != MessageType.DataCollectionTestStartAck)
if (message != null && message.MessageType != MessageType.DataCollectionTestStartAck)
{
if (EqtTrace.IsErrorEnabled)
{
Expand All @@ -108,8 +108,7 @@ public Collection<AttachmentSet> SendTestCaseEnd(TestCaseEndEventArgs e)
this.communicationManager.SendMessage(MessageType.DataCollectionTestEnd, e);

var message = this.communicationManager.ReceiveMessage();

if (message.MessageType == MessageType.DataCollectionTestEndResult)
if (message != null && message.MessageType == MessageType.DataCollectionTestEndResult)
{
attachmentSets = this.dataSerializer.DeserializePayload<Collection<AttachmentSet>>(message);
}
Expand Down
9 changes: 7 additions & 2 deletions src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,12 @@ public void SendRawMessage(string rawMessage)
public Message ReceiveMessage()
{
var rawMessage = this.ReceiveRawMessage();
return this.dataSerializer.DeserializeMessage(rawMessage);
if (!string.IsNullOrEmpty(rawMessage))
{
return this.dataSerializer.DeserializeMessage(rawMessage);
}

return null;
}

/// <summary>
Expand Down Expand Up @@ -317,7 +322,7 @@ public string ReceiveRawMessage()
lock (this.receiveSyncObject)
{
// Reading message on binaryreader is not thread-safe
return this.binaryReader.ReadString();
return this.binaryReader?.ReadString();
}
}

Expand Down
16 changes: 16 additions & 0 deletions ...soft.TestPlatform.CommunicationUtilities.PlatformTests/SocketCommunicationManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,22 @@ public void SocketPollShouldNotHangServerClientCommunication()
Assert.IsTrue(true);
}

[TestMethod]
public async Task ReceiveRawMessageNotConnectedSocketShouldReturnNull()
{
var peer = new SocketCommunicationManager();
Assert.IsNull(peer.ReceiveRawMessage());
Assert.IsNull(await peer.ReceiveRawMessageAsync(CancellationToken.None));
}

[TestMethod]
public async Task ReceiveMessageNotConnectedSocketShouldReturnNull()
{
var peer = new SocketCommunicationManager();
Assert.IsNull(peer.ReceiveMessage());
Assert.IsNull(await peer.ReceiveMessageAsync(CancellationToken.None));
}

private static void SendData(ICommunicationManager communicationManager)
{
// Having less than the buffer size in SocketConstants.BUFFERSIZE.
Expand Down