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: Fix two bugs that caused wrong query parameters with navigateToURL

This commit is contained in:
Tom Schuster 2024-04-18 23:11:03 +02:00
parent 5c1fcb9f26
commit cdf587c5a5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/avm2/globals/flash/net.rs
View File

@ -55,7 +55,7 @@ fn parse_data<'gc>(
if data.is_of_type(activation, urlvariables) {
let obj = data.coerce_to_object(activation)?;
vars = object_to_index_map(activation, &obj).unwrap_or_default();
} else {
} else if *data != Value::Null {
let str_data = data.coerce_to_string(activation)?.to_string();
if !url.contains('?') {
url.push('?');

4
frontend-utils/src/backends/navigator.rs
View File

@ -138,7 +138,7 @@ impl<F: FutureSpawner, I: NavigatorInterface> NavigatorBackend for ExternalNavig
};
let modified_url = match vars_method {
Some((_, query_pairs)) => {
Some((_, query_pairs)) if !query_pairs.is_empty() => {
{
//lifetime limiter because we don't have NLL yet
let mut modifier = parsed_url.query_pairs_mut();
@ -150,7 +150,7 @@ impl<F: FutureSpawner, I: NavigatorInterface> NavigatorBackend for ExternalNavig
parsed_url
}
None => parsed_url,
_ => parsed_url,
};
if modified_url.scheme() == "javascript" {