quasar
/
Quasar
mirror of https://github.com/quasar/Quasar.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improved error handling when parsing hosts list

This commit is contained in:
MaxXor 2015-08-03 22:26:12 +02:00
parent ac9f386ec9
commit 173e600cf2
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Client/Core/Helper/HostHelper.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using xClient.Core.Utilities;
@ -12,14 +11,16 @@ namespace xClient.Core.Helper
{
List<Host> hostsList = new List<Host>();
if (string.IsNullOrEmpty(rawHosts)) return hostsList;
var hosts = rawHosts.Split(';');
foreach (var hostPart in from host in hosts where !string.IsNullOrEmpty(host) select host.Split(':'))
foreach (var hostPart in from host in hosts where (!string.IsNullOrEmpty(host) && host.Contains(':')) select host.Split(':'))
{
if (hostPart.Length != 2 || hostPart[0].Length < 1 || hostPart[1].Length < 1) throw new Exception("Invalid host");
if (hostPart.Length != 2 || hostPart[0].Length < 1 || hostPart[1].Length < 1) continue; // invalid, ignore host
ushort port;
if (!ushort.TryParse(hostPart[1], out port)) throw new Exception("Invalid host");
if (!ushort.TryParse(hostPart[1], out port)) continue; // invalid, ignore host
hostsList.Add(new Host { Hostname = hostPart[0], Port = port });
}

13
Server/Core/Helper/HostHelper.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using xServer.Core.Utilities;
@ -12,16 +11,18 @@ namespace xServer.Core.Helper
{
List<Host> hostsList = new List<Host>();
if (string.IsNullOrEmpty(rawHosts)) return hostsList;
var hosts = rawHosts.Split(';');
foreach (var hostPart in from host in hosts where !string.IsNullOrEmpty(host) select host.Split(':'))
foreach (var hostPart in from host in hosts where (!string.IsNullOrEmpty(host) && host.Contains(':')) select host.Split(':'))
{
if (hostPart.Length != 2 || hostPart[0].Length < 1 || hostPart[1].Length < 1) throw new Exception("Invalid host");
if (hostPart.Length != 2 || hostPart[0].Length < 1 || hostPart[1].Length < 1) continue; // invalid, ignore host
ushort port;
if (!ushort.TryParse(hostPart[1], out port)) throw new Exception("Invalid host");
if (!ushort.TryParse(hostPart[1], out port)) continue; // invalid, ignore host
hostsList.Add(new Host {Hostname = hostPart[0], Port = port});
hostsList.Add(new Host { Hostname = hostPart[0], Port = port });
}
return hostsList;