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

util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree.

Browse source
This commit is contained in:
Waqas Hussain 2016-03-05 17:51:35 -05:00
parent 9b896c90a7
commit edcf8f0c7d
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
util/xml.lua
View file

@ -1,6 +1,8 @@
local st = require "util.stanza";
local lxp = require "lxp";
local t_insert = table.insert;
local t_remove = table.remove;
local _ENV = nil;
@ -14,15 +16,19 @@ local parse_xml = (function()
--luacheck: ignore 212/self
local handler = {};
local stanza = st.stanza("root");
local namespaces = {}
local namespaces = {};
local prefixes = {};
function handler:StartNamespaceDecl(prefix, url)
if prefix ~= nil then
namespaces[prefix] = url
t_insert(namespaces, url);
t_insert(prefixes, prefix);
end
end
function handler:EndNamespaceDecl(prefix)
if prefix ~= nil then
namespaces[prefix] = nil
-- we depend on each StartNamespaceDecl having a paired EndNamespaceDecl
t_remove(namespaces);
t_remove(prefixes);
end
end
function handler:StartElement(tagname, attr)
@ -46,8 +52,8 @@ local parse_xml = (function()
end
end
local n = {}
for prefix, url in pairs(namespaces) do
n[prefix] = url
for i=1,#namespaces do
n[prefixes[i]] = namespaces[i];
end
stanza:tag(name, attr, n);
end