liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avm2: Handle undefined arg in XML.elements()

This commit is contained in:
yoganlava 2023-03-22 18:13:03 +00:00 committed by Mike Welsh
parent 847465cb86
commit ab263b8c6a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/avm2/globals/xml.rs
View File

@ -105,11 +105,11 @@ pub fn name_to_multiname<'gc>(
}
}
let name_string = name.coerce_to_string(activation)?;
Ok(if &*name_string == b"*" || *name == Value::Undefined {
let name = name.coerce_to_string(activation)?;
Ok(if &*name == b"*" {
Multiname::any(activation.context.gc_context)
} else {
Multiname::new(activation.avm2().public_namespace, name_string)
Multiname::new(activation.avm2().public_namespace, name)
})
}
@ -167,7 +167,11 @@ pub fn elements<'gc>(
args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> {
let xml = this.unwrap().as_xml_object().unwrap();
let multiname = name_to_multiname(activation, &args[0])?;
let multiname = if args[0] == Value::Undefined {
Multiname::any(activation.context.gc_context)
} else {
name_to_multiname(activation, &args[0])?
};
let children = if let E4XNodeKind::Element { children, .. } = &*xml.node().kind() {
children
.iter()