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

[Fix] Add a closing square bracket check

Browse Source 
Fix for a part of pull request #264.
This commit is contained in:
sta 2016-05-27 15:11:02 +09:00
parent e36ee5e7ac
commit 6878e608e7
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
websocket-sharp/Net/HttpListenerPrefix.cs
View File

@ -157,37 +157,34 @@ namespace WebSocketSharp.Net
var len = uriPrefix.Length; var len = uriPrefix.Length;
if (len == 0) if (len == 0)
throw new ArgumentException ("An empty string."); throw new ArgumentException ("An empty string.", "uriPrefix");
if (!(uriPrefix.StartsWith ("http://") || uriPrefix.StartsWith ("https://"))) if (!(uriPrefix.StartsWith ("http://") || uriPrefix.StartsWith ("https://")))
throw new ArgumentException ("The scheme isn't 'http' or 'https'."); throw new ArgumentException ("The scheme isn't 'http' or 'https'.", "uriPrefix");
var startHost = uriPrefix.IndexOf (':') + 3; var startHost = uriPrefix.IndexOf (':') + 3;
if (startHost >= len) if (startHost >= len)
throw new ArgumentException ("No host is specified."); throw new ArgumentException ("No host is specified.", "uriPrefix");
var colon = uriPrefix.IndexOf (':', startHost, len - startHost); if (uriPrefix[startHost] == ':')
if (startHost == colon) throw new ArgumentException ("No host is specified.", "uriPrefix");
throw new ArgumentException ("No host is specified.");
if (colon > 0) { var root = uriPrefix.IndexOf ('/', startHost, len - startHost);
var root = uriPrefix.IndexOf ('/', colon, len - colon); if (root == startHost)
if (root == -1) throw new ArgumentException ("No host is specified.", "uriPrefix");
throw new ArgumentException ("No path is specified.");
int port;
if (!Int32.TryParse (uriPrefix.Substring (colon + 1, root - colon - 1), out port) ||
!port.IsPortNumber ())
throw new ArgumentException ("An invalid port is specified.");
}
else {
var root = uriPrefix.IndexOf ('/', startHost, len - startHost);
if (root == -1)
throw new ArgumentException ("No path is specified.");
}
if (uriPrefix[len - 1] != '/') if (uriPrefix[len - 1] != '/')
throw new ArgumentException ("Ends without '/'."); throw new ArgumentException ("Ends without '/'.", "uriPrefix");
var colon = uriPrefix.LastIndexOf (':', root - 1, root - startHost - 1);
if (uriPrefix[root - 1] != ']' && colon > startHost) {
int port;
if (!Int32.TryParse (uriPrefix.Substring (colon + 1, root - colon - 1), out port)
|| !port.IsPortNumber ()
) {
throw new ArgumentException ("An invalid port is specified.", "uriPrefix");
}
}
} }
// The Equals and GetHashCode methods are required to detect duplicates in any collection. // The Equals and GetHashCode methods are required to detect duplicates in any collection.