Merge branch 'master' into segment-deletion

1 files changed, 6 insertions, 1 deletions

diff --git a/MediaBrowser.Common/Net/IPNetAddress.cs b/MediaBrowser.Common/Net/IPNetAddress.cs
index 98d1c2d97..de72d978e 100644
--- a/MediaBrowser.Common/Net/IPNetAddress.cs
+++ b/MediaBrowser.Common/Net/IPNetAddress.cs
@@ -167,6 +167,11 @@ namespace MediaBrowser.Common.Net
                 address = address.MapToIPv4();
             }
 
+            if (address.AddressFamily != AddressFamily)
+            {
+                return false;
+            }
+
             var (altAddress, altPrefix) = NetworkAddressOf(address, PrefixLength);
             return NetworkAddress.Address.Equals(altAddress) && NetworkAddress.PrefixLength >= altPrefix;
         }
@@ -214,7 +219,7 @@ namespace MediaBrowser.Common.Net
         /// <inheritdoc/>
         public override bool Equals(IPAddress ip)
         {
-            if (ip != null && !ip.Equals(IPAddress.None) && !Address.Equals(IPAddress.None))
+            if (ip is not null && !ip.Equals(IPAddress.None) && !Address.Equals(IPAddress.None))
             {
                 return ip.Equals(Address);
             }