diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-04-05 15:05:40 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-04-05 15:05:40 +0100 |
| commit | 3f442f66f5c72e354c8e8ddd98e3695f4206ec7b (patch) | |
| tree | b09836bdc399a225356de8a3f77b90dc77d64d59 /plugins/mod_admin_telnet.lua | |
| parent | 208fa9afdeb4b0273ac1271bfca738f802346e2d (diff) | |
| download | prosody-3f442f66f5c72e354c8e8ddd98e3695f4206ec7b.tar.gz prosody-3f442f66f5c72e354c8e8ddd98e3695f4206ec7b.zip | |
mod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with a non-existent host
Diffstat (limited to 'plugins/mod_admin_telnet.lua')
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 2572e982..6f02f030 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -942,6 +942,9 @@ end function def_env.muc:create(room_jid) local room, host = check_muc(room_jid); + if not room_name then + return room_name, host; + end if not room then return nil, host end if hosts[host].modules.muc.rooms[room_jid] then return nil, "Room exists already" end return hosts[host].modules.muc.create_room(room_jid); @@ -949,6 +952,9 @@ end function def_env.muc:room(room_jid) local room_name, host = check_muc(room_jid); + if not room_name then + return room_name, host; + end local room_obj = hosts[host].modules.muc.rooms[room_jid]; if not room_obj then return nil, "No such room: "..room_jid; |