diff options
author | Mathieu Velten <mathieuv@matrix.org> | 2022-11-28 12:57:35 +0100 |
---|---|---|
committer | Mathieu Velten <mathieuv@matrix.org> | 2022-11-28 12:57:35 +0100 |
commit | 5ff0ba261c5b9bc9310905eef94e267d2e8d0708 (patch) | |
tree | 298b7e03ec1b20b79092a63d2daedc33b279db3a /synapse/util/stringutils.py | |
parent | Adress comments (diff) | |
parent | Run Rust CI when Cargo.lock changes too (#14571) (diff) | |
download | synapse-5ff0ba261c5b9bc9310905eef94e267d2e8d0708.tar.xz |
Merge remote-tracking branch 'origin/develop' into mv/unbind-callback
Diffstat (limited to 'synapse/util/stringutils.py')
-rw-r--r-- | synapse/util/stringutils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py index 27a363d7e5..4961fe9313 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py @@ -86,7 +86,7 @@ def parse_server_name(server_name: str) -> Tuple[str, Optional[int]]: ValueError if the server name could not be parsed. """ try: - if server_name[-1] == "]": + if server_name and server_name[-1] == "]": # ipv6 literal, hopefully return server_name, None @@ -123,7 +123,7 @@ def parse_and_validate_server_name(server_name: str) -> Tuple[str, Optional[int] # that nobody is sneaking IP literals in that look like hostnames, etc. # look for ipv6 literals - if host[0] == "[": + if host and host[0] == "[": if host[-1] != "]": raise ValueError("Mismatched [...] in server name '%s'" % (server_name,)) |