From bdde11c0ef1c8808f2f870e043d4984ff49c7eb8 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 8 Nov 2015 18:14:42 +0000 Subject: [PATCH] Fix NPE from URL->URI conversion new URL(null) throws MUE new URI(null) throws NPE --- apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java index 2e75906c8..fc48c6d87 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java +++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java @@ -875,16 +875,18 @@ public class TrackerClient implements Runnable { } /** - * @param ann an announce URL + * @param ann an announce URL, may be null, returns false if null * @return true for i2p hosts only * @since 0.7.12 */ public static boolean isValidAnnounce(String ann) { + if (ann == null) + return false; URI url; try { - url = new URI(ann); + url = new URI(ann); } catch (URISyntaxException use) { - return false; + return false; } return "http".equals(url.getScheme()) && url.getHost() != null && (url.getHost().endsWith(".i2p") || url.getHost().equals("i2p"));