From 71f4194513b679ab2f04644700a872ea2c8cb0dd Mon Sep 17 00:00:00 2001
From: Dmitry Podgorny <pasis.ua@gmail.com>
Date: Wed, 31 Jul 2013 01:37:02 +0300
Subject: fixed null pointer dereference in /join command

Command /join @/ leads to crash because jid_create("@/") returns NULL
---
 src/command/command.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/command/command.c b/src/command/command.c
index 2e31605d..d8b955a2 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -2673,10 +2673,15 @@ _cmd_join(gchar **args, struct cmd_help_t help)
         return TRUE;
     }
 
+    Jid *room_arg = jid_create(args[0]);
+    if (room_arg == NULL) {
+        cons_show_error("Specified room has incorrect format");
+        return TRUE;
+    }
+
     int num_args = g_strv_length(args);
     char *room = NULL;
     char *nick = NULL;
-    Jid *room_arg = jid_create(args[0]);
     GString *room_str = g_string_new("");
     Jid *my_jid = jid_create(jabber_get_fulljid());
 
-- 
cgit 1.4.1-2-gfad0