Skip to content

Commit 05e2ded

Browse files
author
psygames
committed
fatal bug fix, receive content concatenated
1 parent 0a82f03 commit 05e2ded

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

Assets/UnityWebSocket/Scripts/Runtime/Core/Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ public static class Settings
77
public const string QQ_GROUP_LINK = "https://qm.qq.com/cgi-bin/qm/qr?k=KcexYJ9aYwogFXbj2aN0XHH5b2G7ICmd";
88
public const string EMAIL = "[email protected]";
99
public const string AUHTOR = "psygames";
10-
public const string VERSION = "2.6.0";
10+
public const string VERSION = "2.6.1";
1111
}
1212
}

Assets/UnityWebSocket/Scripts/Runtime/Implementation/NoWebGL/WebSocket.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,16 +200,17 @@ private async Task ReceiveTask()
200200
ushort closeCode = 0;
201201
bool isClosed = false;
202202
var segment = new ArraySegment<byte>(new byte[8192]);
203-
var ms = new MemoryStream();
204203

205204
try
206205
{
207206
while (!IsCtsCanceled && !isClosed)
208207
{
208+
var ms = new MemoryStream();
209209
var result = await socket.ReceiveAsync(segment, cts.Token);
210-
ms.Write(segment.Array, segment.Offset, result.Count);
210+
ms.Write(segment.Array, 0, result.Count);
211211
if (!result.EndOfMessage) continue;
212212
var data = ms.ToArray();
213+
ms.Close();
213214
switch (result.MessageType)
214215
{
215216
case WebSocketMessageType.Binary:
@@ -224,7 +225,6 @@ private async Task ReceiveTask()
224225
closeReason = result.CloseStatusDescription;
225226
break;
226227
}
227-
ms.Seek(0, SeekOrigin.Begin);
228228
}
229229
}
230230
catch (Exception e)
@@ -233,10 +233,6 @@ private async Task ReceiveTask()
233233
closeCode = (ushort)CloseStatusCode.Abnormal;
234234
closeReason = e.Message;
235235
}
236-
finally
237-
{
238-
ms.Close();
239-
}
240236

241237
cts.Cancel();
242238

0 commit comments

Comments
 (0)