Skip to content

Fix issue 4509 - XML parser in std.xml throws TagException if the attr value is put in apostrophes. #4567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
quickfur merged 3 commits into from
Jul 6, 2016
Merged

Fix issue 4509 - XML parser in std.xml throws TagException if the attr value is put in apostrophes. #4567

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1533801
std.xml: accept single quotes for attributes
cosmo-kramer Mar 7, 2016
85bb6c2
add asserts and attributes
aG0aep6G Jul 5, 2016
bab9832
actually do the parsing
aG0aep6G Jul 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 33 additions & 3 deletions std/xml.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,9 +1072,10 @@ class Tag
munch(s,whitespace);
reqc(s,'=');
munch(s,whitespace);
reqc(s,'"');
string val = decode(munch(s,"^\""), DecodeMode.LOOSE);
reqc(s,'"');
char quote = requireOneOf(s,"'\"");
char[2] notQuote = ['^', quote];
string val = decode(munch(s,notQuote[]), DecodeMode.LOOSE);
reqc(s,quote);
munch(s,whitespace);
attr[key] = val;
}
Expand Down Expand Up @@ -2722,6 +2723,26 @@ EOS";
}
}

@system unittest
{
string test_xml = `<?xml version="1.0" encoding='UTF-8'?><r><stream:stream
xmlns:stream="http://etherx.'jabber'.org/streams"
xmlns="jabber:'client'" from='jid.pl' id="587a5767"
xml:lang="en" version="1.0" attr='a"b"c'>
</stream:stream></r>`;

DocumentParser parser = new DocumentParser(test_xml);
bool tested = false;
parser.onStartTag["stream:stream"] = (ElementParser p) {
assert(p.tag.attr["xmlns"] == "jabber:'client'");
assert(p.tag.attr["from"] == "jid.pl");
assert(p.tag.attr["attr"] == "a\"b\"c");
tested = true;
};
parser.parse();
assert(tested);
}

@system unittest
{
string s = q"EOS
Expand Down Expand Up @@ -2868,6 +2889,15 @@ private
s = s[1..$];
}

char requireOneOf(ref string s, string chars) @safe
{
if (s.length == 0 || indexOf(chars,s[0]) == -1)
throw new TagException("");
char ch = s[0];
s = s[1..$];
return ch;
}

size_t hash(string s,size_t h=0) @trusted nothrow
{
return typeid(s).getHash(&s) + h;
Expand Down