sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] fixed doctor buffer overflow

Browse Source
This commit is contained in:
Sem van der Hoeven
2020-10-28 13:23:20 +01:00
parent 5f2e325cb1
commit 1c7f9cf70a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ClientApp/Utils/EngineConnection.cs
View File

@@ -243,7 +243,7 @@ namespace ClientApp.Utils
SendMessageAndOnResponse(mainCommand.addPanel("panelAdd", bikeId), "panelAdd", SendMessageAndOnResponse(mainCommand.addPanel("panelAdd", bikeId), "panelAdd",
(message) => (message) =>
{ {
Write("got panel id");
panelId = JSONParser.getPanelID(message); panelId = JSONParser.getPanelID(message);
WriteTextMessage(mainCommand.ColorPanel(panelId)); WriteTextMessage(mainCommand.ColorPanel(panelId));
@@ -295,6 +295,7 @@ namespace ClientApp.Utils
public void UpdateInfoPanel() public void UpdateInfoPanel()
{ {
Write("updating info panel");
ShowPanel(BikeSpeed, (int)BikeBPM, (int)BikePower, (int)BikeResistance); ShowPanel(BikeSpeed, (int)BikeBPM, (int)BikePower, (int)BikeResistance);
WriteTextMessage(mainCommand.RouteSpeed(BikeSpeed, bikeId)); WriteTextMessage(mainCommand.RouteSpeed(BikeSpeed, bikeId));
WriteTextMessage(mainCommand.RouteSpeed(BikeSpeed, cameraId)); WriteTextMessage(mainCommand.RouteSpeed(BikeSpeed, cameraId));

3
DoctorApp/Utils/Client.cs
View File

@@ -129,14 +129,13 @@ namespace DoctorApp.Utils
{ {
MainViewModel.TransferDataToClientBPM(payloadbytes); MainViewModel.TransferDataToClientBPM(payloadbytes);
} }
Array.Copy(totalBuffer, expectedMessageLength, totalBuffer, 0, (totalBufferReceived - expectedMessageLength)); //maybe unsafe idk
totalBufferReceived -= expectedMessageLength; totalBufferReceived -= expectedMessageLength;
expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0); expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
} }
if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead) || !this.client.Connected) if (ar == null || (!ar.IsCompleted) || (!this.stream.CanRead) || !this.client.Connected)
return; return;
ar.AsyncWaitHandle.WaitOne();
this.stream.BeginRead(this.buffer, 0, this.buffer.Length, new AsyncCallback(OnRead), null); this.stream.BeginRead(this.buffer, 0, this.buffer.Length, new AsyncCallback(OnRead), null);
} }