aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc/muc.lib.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-11-17 17:01:25 +0000
committerMatthew Wild <mwild1@gmail.com>2015-11-17 17:01:25 +0000
commit1bb13d90dded966c20d69af42ad1928c01b82332 (patch)
tree5e9220894c522749567afc6a07e1ac4c6c591027 /plugins/muc/muc.lib.lua
parentcbb1f06088661f0cdbaa04d26175f29613e9d57f (diff)
downloadprosody-1bb13d90dded966c20d69af42ad1928c01b82332.tar.gz
prosody-1bb13d90dded966c20d69af42ad1928c01b82332.zip
muc.lib: Fix pattern so that it doesn't match hashes containing null bytes, causing dropped stanzas (thanks Jitsi folk!)
Diffstat (limited to 'plugins/muc/muc.lib.lua')
-rw-r--r--plugins/muc/muc.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 8028f5ae..d42fb2eb 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -361,7 +361,7 @@ local function construct_stanza_id(room, stanza)
end
local function deconstruct_stanza_id(room, stanza)
local from_jid_possiblybare, to_nick = stanza.attr.from, stanza.attr.to;
- local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$");
+ local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(%Z+)%z(%Z*)%z(.+)$");
local from_nick = room._jid_nick[from_jid];
if not(from_nick) then return; end