From 5b28eb53e8623448b1c2bdb46b8924662e690995 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 16 Feb 2015 22:46:55 -0800 Subject: [PATCH] Add safty to URL detection in chat. Closes #1712 --- .../java/net/minecraftforge/common/ForgeHooks.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 5d0ccb2bd8..b076ad8e8d 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -10,6 +10,7 @@ import static net.minecraft.init.Blocks.lit_redstone_ore; import static net.minecraft.init.Blocks.redstone_ore; import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -463,10 +464,17 @@ public class ForgeHooks String url = string.substring(start, end); IChatComponent link = new ChatComponentText(url); - // Add schema so client doesn't crash. - if (URI.create(url).getScheme() == null) + try { - url = "http://" + url; + // Add schema so client doesn't crash. + if ((new URI(url)).getScheme() == null) + url = "http://" + url; + } + catch (URISyntaxException e) + { + // Bad syntax bail out! + ichat.appendText(url); + continue; } // Set the click event and append the link.