diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-27 18:55:49 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-27 18:55:49 +0200 |
| commit | fc96a38dec775b31df1c37aec4ad82aa636c3ff8 (patch) | |
| tree | 8d523a5c614c952d52eba04f649736ea771882d6 /plugins/muc | |
| parent | 6532dc402cfde82286a5b27fc3ffc564fa7b2097 (diff) | |
| download | prosody-fc96a38dec775b31df1c37aec4ad82aa636c3ff8.tar.gz prosody-fc96a38dec775b31df1c37aec4ad82aa636c3ff8.zip | |
MUC: Be more careful with deserialization of rooms, fix case where a bare jid has joined as multiple participants
Diffstat (limited to 'plugins/muc')
| -rw-r--r-- | plugins/muc/muc.lib.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 14aad42c..ce6c5784 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -1283,10 +1283,10 @@ function _M.restore_room(frozen) for jid, data in pairs(frozen) do local node, host, resource = jid_split(jid); if node or host:sub(1,1) ~= "_" then - if not resource then + if not resource and type(data) == "string" then -- bare jid: affiliation room._affiliations[jid] = data; - elseif host == room_host and node == room_name then + elseif host == room_host and node == room_name and resource then -- full room jid: bare real jid and role local bare_jid = data.bare_jid; local occupant = occupant_lib.new(bare_jid, jid); |