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

2 files changed, 13 insertions, 0 deletions

diff --git a/spec/util_stanza_spec.lua b/spec/util_stanza_spec.lua
index aabeeadc..383beae3 100644
--- a/spec/util_stanza_spec.lua
+++ b/spec/util_stanza_spec.lua
@@ -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);
diff --git a/util/stanza.lua b/util/stanza.lua
index 11398179..f08baef7 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -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