Merge branch '952' into upstream-v0.6

2018-03-22 16:16:24 +01:00 · 2018-03-22 16:16:24 +01:00 · 55d6239e3d
parent d7ac440a04 d974065f8e
commit 55d6239e3d
1 changed files with 4 additions and 1 deletions
--- a/src/protocol.py
+++ b/src/protocol.py
@ -100,7 +100,10 @@ def checkIPAddress(host, private=False):
            return False
        return hostStandardFormat
    else:
-        hostStandardFormat = socket.inet_ntop(socket.AF_INET6, host)
+        try:
+            hostStandardFormat = socket.inet_ntop(socket.AF_INET6, host)
+        except ValueError:
+            return False
        if hostStandardFormat == "":
            # This can happen on Windows systems which are not 64-bit compatible 
            # so let us drop the IPv6 address.