diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-04 15:35:22 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2015-12-04 20:17:32 +0100 |
commit | ced86f8990f4f89c7acbc3817b270ca8b7a61f43 (patch) | |
tree | 7ebc022ca8da0c07845c96a0d130aaf57bd772d0 /src/main/java/eu/siacs/conversations/utils | |
parent | 81879aa82dc8ac811864fa39a7a9d1b3a16cfab1 (diff) |
avoid some NPEs
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/DNSHelper.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java index f3c4f79a2..e07df627e 100644 --- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java @@ -227,10 +227,11 @@ public class DNSHelper { } public static boolean isIp(final String server) { - return PATTERN_IPV4.matcher(server).matches() + return server != null && ( + PATTERN_IPV4.matcher(server).matches() || PATTERN_IPV6.matcher(server).matches() || PATTERN_IPV6_6HEX4DEC.matcher(server).matches() || PATTERN_IPV6_HEX4DECCOMPRESSED.matcher(server).matches() - || PATTERN_IPV6_HEXCOMPRESSED.matcher(server).matches(); + || PATTERN_IPV6_HEXCOMPRESSED.matcher(server).matches()); } } |