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
2019-08-17 22:01:51 +09:00
parent fcc14146d9
commit e44a6c799f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
websocket-sharp/WebSocketFrame.cs
View File

@@ -608,7 +608,9 @@ Extended Payload Length: {7}
); );
} }
private static WebSocketFrame readPayloadData (Stream stream, WebSocketFrame frame) private static WebSocketFrame readPayloadData (
Stream stream, WebSocketFrame frame
)
{ {
var len = frame.FullPayloadLength; var len = frame.FullPayloadLength;
if (len == 0) { if (len == 0) {
@@ -616,17 +618,20 @@ Extended Payload Length: {7}
return frame; return frame;
} }
if (len > PayloadData.MaxLength) if (len > PayloadData.MaxLength) {
throw new WebSocketException (CloseStatusCode.TooBig, "A frame has a long payload length."); var msg = "A frame has too long payload data length.";
throw new WebSocketException (CloseStatusCode.TooBig, msg);
}
var llen = (long) len; var llen = (long) len;
var bytes = frame._payloadLength < 127 var bytes = frame._payloadLength < 127
? stream.ReadBytes ((int) len) ? stream.ReadBytes ((int) len)
: stream.ReadBytes (llen, 1024); : stream.ReadBytes (llen, 1024);
if (bytes.LongLength != llen) if (bytes.LongLength != llen) {
throw new WebSocketException ( var msg = "The payload data of a frame could not be read.";
"The payload data of a frame cannot be read from the stream."); throw new WebSocketException (msg);
}
frame._payloadData = new PayloadData (bytes, llen); frame._payloadData = new PayloadData (bytes, llen);
return frame; return frame;