summary refs log tree commit diff stats
path: root/src/common
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2013-01-10 01:59:08 -0800
committerTingPing <tingping@tingping.se>2013-01-10 01:59:08 -0800
commit4a2ecc5d6c3a32b78856f2864a6dbc2ba19b1424 (patch)
tree991b0a10ec91b2fa9882f2e9f050a4219599f3b1 /src/common
parentba2927e3c5e797160be7dee8d90b78d035b76c93 (diff)
parent475eb9fcaab1d846a3617f587f22bd77cdeddd5e (diff)
Merge pull request #370 from RichardHitt/pull369
Fix crash by detecting NULL channel in url_join_only() and just returnin...
Diffstat (limited to 'src/common')
-rw-r--r--src/common/outbound.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/outbound.c b/src/common/outbound.c
index f8f73dd6..8241d78f 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -3350,6 +3350,8 @@ static void
 url_join_only (server *serv, char *tbuf, char *channel)
 {
 	/* already connected, JOIN only. FIXME: support keys? */
+	if (channel == NULL)
+		return;
 	tbuf[0] = '#';
 	/* tbuf is 4kb */
 	safe_strcpy ((tbuf + 1), channel, 256);