mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981

Browse source
This commit is contained in:
Matthew Wild 2018-08-19 21:56:33 +01:00
parent c17a785604
commit 3b0271f560
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spec/util_stanza_spec.lua
View file

@ -327,5 +327,12 @@ describe("util.stanza", function()
end);
assert.equal(3, #s.tags);
end);
it("errors on invalid data - #981", function ()
local s = st.message({}, "Hello");
s.tags[1] = st.clone(s.tags[1]);
assert.has_error_match(function ()
s:maptags(function () end);
end, "Invalid stanza");
end);
end);
end);

6
util/stanza.lua
View file

@ -217,6 +217,7 @@ end
function stanza_mt:maptags(callback)
local tags, curr_tag = self.tags, 1;
local n_children, n_tags = #self, #tags;
local max_iterations = n_children + 1;
local i = 1;
while curr_tag <= n_tags and n_tags > 0 do
@ -236,6 +237,11 @@ function stanza_mt:maptags(callback)
curr_tag = curr_tag + 1;
end
i = i + 1;
if i > max_iterations then
-- COMPAT: Hopefully temporary guard against #981 while we
-- figure out the root cause
error("Invalid stanza state! Please report this error.");
end
end
return self;
end