Two fixes

1 files changed, 11 insertions, 0 deletions

diff --git a/Emby.Server.Implementations/Networking/NetworkManager.cs b/Emby.Server.Implementations/Networking/NetworkManager.cs
index 6aa1dfbc9..54d0e29ed 100644
--- a/Emby.Server.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Server.Implementations/Networking/NetworkManager.cs
@@ -152,6 +152,11 @@ namespace Emby.Server.Implementations.Networking
                 return true;
             }
 
+            if (!IPAddress.TryParse(endpoint, out _))
+            {
+                return false;
+            }
+
             byte[] octet = IPAddress.Parse(endpoint).GetAddressBytes();
 
             if ((octet[0] == 10) ||
@@ -268,6 +273,12 @@ namespace Emby.Server.Implementations.Networking
             string excludeAddress = "[" + addressString + "]";
             var subnets = LocalSubnetsFn();
 
+            // Include any address if LAN subnets aren't specified
+            if (subnets.Length == 0)
+            {
+                return true;
+            }
+
             // Exclude any addresses if they appear in the LAN list in [ ]
             if (Array.IndexOf(subnets, excludeAddress) != -1)
             {