pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try not to allocate memory when comparing ending tags with starting tags

Browse source
This commit is contained in:
lumi 2018-01-01 14:01:03 +01:00
parent 0e76e5211d
commit cdb2cb8d86
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/element.rs
View file

@ -340,13 +340,35 @@ impl Element {
} }
let elem = stack.pop().unwrap(); let elem = stack.pop().unwrap();
if let Some(to) = stack.last_mut() { if let Some(to) = stack.last_mut() {
let name = match elem.prefix() { // TODO: check whether this is correct, we are comparing &[u8]s, not &strs
Some(ref prefix) => format!("{}:", prefix), let elem_name = e.name();
None => String::from(""), let mut split_iter = elem_name.splitn(2, |u| *u == 0x3A);
} + elem.name(); let possible_prefix = split_iter.next().unwrap(); // Can't be empty.
if name.as_bytes() != e.name() { match split_iter.next() {
Some(name) => {
match elem.prefix() {
Some(prefix) => {
if possible_prefix != prefix.as_bytes() {
bail!(ErrorKind::InvalidElementClosed); bail!(ErrorKind::InvalidElementClosed);
} }
},
None => {
bail!(ErrorKind::InvalidElementClosed);
},
}
if name != elem.name().as_bytes() {
bail!(ErrorKind::InvalidElementClosed);
}
},
None => {
if elem.prefix().is_some() {
bail!(ErrorKind::InvalidElementClosed);
}
if possible_prefix != elem.name().as_bytes() {
bail!(ErrorKind::InvalidElementClosed);
}
},
}
to.append_child(elem); to.append_child(elem);
} }
}, },