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: Throw special XML parsing error for empty namespace prefixes

This commit is contained in:
Tom Schuster 2024-08-30 23:30:51 +02:00
parent 52eb5d6614
commit 7de9135a3b
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/src/avm2/e4x.rs
View File

@ -1013,6 +1013,35 @@ impl<'gc> E4XNode<'gc> {
let mut attribute_nodes = Vec::new();
let mut namespaces = Vec::new();
fn make_unknown_ns_error<'gc>(
activation: &mut Activation<'_, 'gc>,
ns: Vec<u8>,
local_name: AvmString<'gc>,
) -> Error<'gc> {
let error = if ns.is_empty() {
type_error(
activation,
&format!("Error #1084: Element or attribute (\":{}\") does not match QName production: QName::=(NCName':')?NCName.", local_name),
1084,
)
} else {
// Note: Flash also uses this error message for attributes.
type_error(
activation,
&format!(
"Error #1083: The prefix \"{}\" for element \"{}\" is not bound.",
String::from_utf8_lossy(&ns),
local_name
),
1083,
)
};
match error {
Ok(err) => Error::AvmError(err),
Err(err) => err,
}
}
let attributes: Result<Vec<_>, _> = bs.attributes().collect();
for attribute in
attributes.map_err(|e| make_xml_error(activation, XmlError::InvalidAttr(e)))?
@ -1046,15 +1075,7 @@ impl<'gc> E4XNode<'gc> {
Some(E4XNamespace { prefix, uri })
}
ResolveResult::Unknown(ns) => {
return Err(Error::AvmError(type_error(
activation,
&format!(
"Error #1083: The prefix \"{}\" for element \"{}\" is not bound.",
String::from_utf8_lossy(&ns),
name
),
1083,
)?))
return Err(make_unknown_ns_error(activation, ns, name));
}
ResolveResult::Unbound => {
// The default XML namespace declaration
@ -1099,15 +1120,7 @@ impl<'gc> E4XNode<'gc> {
Some(E4XNamespace { prefix, uri })
}
ResolveResult::Unknown(ns) => {
return Err(Error::AvmError(type_error(
activation,
&format!(
"Error #1083: The prefix \"{}\" for element \"{}\" is not bound.",
String::from_utf8_lossy(&ns),
name
),
1083,
)?))
return Err(make_unknown_ns_error(activation, ns, name));
}
ResolveResult::Unbound => None,
};

1
tests/tests/swfs/from_avmplus/as3/RuntimeErrors/Error1084XmlQNameProductionMismatch/test.toml vendored
View File

@ -1,2 +1 @@
num_ticks = 1
known_failure = true

1
tests/tests/swfs/from_avmplus/e4x/Expressions/kXMLBadQNameErr/test.toml vendored
View File

@ -1,2 +1 @@
num_ticks = 1
known_failure = true # https://github.com/ruffle-rs/ruffle/issues/12351