From 8014e28c7f25aa9c96c258c762f55ba5bc20712f Mon Sep 17 00:00:00 2001 From: sta Date: Thu, 10 Sep 2020 20:11:10 +0900 Subject: [PATCH] [Modify] Polish it --- websocket-sharp/Net/HttpListenerPrefix.cs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/websocket-sharp/Net/HttpListenerPrefix.cs b/websocket-sharp/Net/HttpListenerPrefix.cs index 1a449048..82268ddd 100644 --- a/websocket-sharp/Net/HttpListenerPrefix.cs +++ b/websocket-sharp/Net/HttpListenerPrefix.cs @@ -174,10 +174,17 @@ namespace WebSocketSharp.Net throw new ArgumentException (msg, "uriPrefix"); } - var host = uriPrefix.IndexOf (':') + 3; var end = len - 1; - if (host > end) { + if (uriPrefix[end] != '/') { + var msg = "It ends without '/'."; + + throw new ArgumentException (msg, "uriPrefix"); + } + + var host = uriPrefix.IndexOf (':') + 3; + + if (host >= end) { var msg = "No host is specified."; throw new ArgumentException (msg, "uriPrefix"); @@ -191,18 +198,6 @@ namespace WebSocketSharp.Net var root = uriPrefix.IndexOf ('/', host, len - host); - if (root == host) { - var msg = "No host is specified."; - - throw new ArgumentException (msg, "uriPrefix"); - } - - if (uriPrefix[end] != '/') { - var msg = "It ends without '/'."; - - throw new ArgumentException (msg, "uriPrefix"); - } - if (uriPrefix[root - 1] == ':') { var msg = "No port is specified.";