From fc96a38dec775b31df1c37aec4ad82aa636c3ff8 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 27 Apr 2016 18:55:49 +0200 Subject: MUC: Be more careful with deserialization of rooms, fix case where a bare jid has joined as multiple participants --- plugins/muc/muc.lib.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') 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); -- cgit v1.2.3