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

[Modify] Throw exception

Browse Source
This commit is contained in:
sta 2018-10-18 19:40:00 +09:00
parent 3a82d30921
commit 157528acf7
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
websocket-sharp/Net/HttpUtility.cs
View File

@ -1141,14 +1141,23 @@ namespace WebSocketSharp.Net
: InternalUrlDecode (bytes, 0, len, encoding ?? Encoding.UTF8); : InternalUrlDecode (bytes, 0, len, encoding ?? Encoding.UTF8);
} }
public static string UrlDecode (byte[] bytes, int offset, int count, Encoding encoding) public static string UrlDecode (
byte[] bytes, int offset, int count, Encoding encoding
)
{ {
if (bytes == null) if (bytes == null)
return null; throw new ArgumentNullException ("bytes");
var len = bytes.Length; var len = bytes.Length;
if (len == 0 || count == 0) if (len == 0) {
if (offset != 0)
throw new ArgumentOutOfRangeException ("offset");
if (count != 0)
throw new ArgumentOutOfRangeException ("count");
return String.Empty; return String.Empty;
}
if (offset < 0 || offset >= len) if (offset < 0 || offset >= len)
throw new ArgumentOutOfRangeException ("offset"); throw new ArgumentOutOfRangeException ("offset");
@ -1156,7 +1165,11 @@ namespace WebSocketSharp.Net
if (count < 0 || count > len - offset) if (count < 0 || count > len - offset)
throw new ArgumentOutOfRangeException ("count"); throw new ArgumentOutOfRangeException ("count");
return InternalUrlDecode (bytes, offset, count, encoding ?? Encoding.UTF8); return count > 0
? InternalUrlDecode (
bytes, offset, count, encoding ?? Encoding.UTF8
)
: String.Empty;
} }
public static byte[] UrlDecodeToBytes (byte[] bytes) public static byte[] UrlDecodeToBytes (byte[] bytes)