diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-03 13:53:21 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-03 13:53:21 +0100 |
| commit | a5ccb8a860924f48570242e468267885137e3e9a (patch) | |
| tree | bf22e9f39d9ccaa98ba9f214cfa01d7c3408d46a /util/stanza.lua | |
| parent | 1ea4d9ab7bde60b904192718247d49aa1337a18e (diff) | |
| parent | 1728207c6bb7f3955535ba4a2c1c6fde8e624ed8 (diff) | |
| download | prosody-a5ccb8a860924f48570242e468267885137e3e9a.tar.gz prosody-a5ccb8a860924f48570242e468267885137e3e9a.zip | |
Merge 0.9->trunk
Diffstat (limited to 'util/stanza.lua')
| -rw-r--r-- | util/stanza.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/util/stanza.lua b/util/stanza.lua index a0ab2a5a..213ed506 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -153,7 +153,7 @@ function stanza_mt:maptags(callback) local n_children, n_tags = #self, #tags; local i = 1; - while curr_tag <= n_tags do + while curr_tag <= n_tags and n_tags > 0 do if self[i] == tags[curr_tag] then local ret = callback(self[i]); if ret == nil then @@ -161,13 +161,15 @@ function stanza_mt:maptags(callback) t_remove(tags, curr_tag); n_children = n_children - 1; n_tags = n_tags - 1; + i = i - 1; + curr_tag = curr_tag - 1; else self[i] = ret; tags[i] = ret; end - i = i + 1; curr_tag = curr_tag + 1; end + i = i + 1; end return self; end |