# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1407424851 -7200
# Node ID 736c388748fd89ae84db5e3091211ce2ba8cf12b
# Parent  925aceee82802a49cabc2e1bb0b5ac3b15e79d51
util.jid: Return early in join on invalid jids

diff -r 925aceee8280 -r 736c388748fd util/jid.lua
--- a/util/jid.lua	Fri Jul 25 21:12:21 2014 +0200
+++ b/util/jid.lua	Thu Aug 07 17:20:51 2014 +0200
@@ -79,16 +79,15 @@
 end
 
 function join(node, host, resource)
-	if node and host and resource then
+	if not host then return end -- Invalid JID
+	if node and resource then
 		return node.."@"..host.."/"..resource;
-	elseif node and host then
+	elseif node then
 		return node.."@"..host;
-	elseif host and resource then
+	elseif resource then
 		return host.."/"..resource;
-	elseif host then
-		return host;
 	end
-	return nil; -- Invalid JID
+	return host;
 end
 
 function compare(jid, acl)