DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Modify] Polish it

Browse Source
This commit is contained in:
sta 2015-09-14 12:07:37 +09:00
parent 2b984221fd
commit a749a67838
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
websocket-sharp/Ext.cs
View File

@ -142,24 +142,22 @@ namespace WebSocketSharp
private static byte[] readBytes (this Stream stream, byte[] buffer, int offset, int count) private static byte[] readBytes (this Stream stream, byte[] buffer, int offset, int count)
{ {
var cnt = 0; var nread = 0;
try { try {
cnt = stream.Read (buffer, offset, count); while (true) {
if (cnt < 1) nread = stream.Read (buffer, offset, count);
return buffer.SubArray (0, offset); if (nread == 0 || nread == count)
while (cnt < count) {
var nread = stream.Read (buffer, offset + cnt, count - cnt);
if (nread < 1)
break; break;
cnt += nread; offset += nread;
count -= nread;
} }
} }
catch { catch {
nread = 0;
} }
return cnt < count ? buffer.SubArray (0, offset + cnt) : buffer; return buffer.SubArray (0, offset + nread);
} }
private static void readBytesAsync ( private static void readBytesAsync (