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

avm1: Correct `Math.{min,max}` 

Don't use `abstract_lt` because it compares strings alphabetically,
unlike `Math.min` and `Math.max` that coerce to a number before comparing.
This commit is contained in:
relrelb 2021-09-15 11:02:40 +03:00 committed by Mike Welsh
parent 384d04536f
commit f92926af54
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
core/src/avm1/globals/math.rs
View File

@ -103,23 +103,24 @@ fn max<'gc>(
_this: Object<'gc>,
args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> {
if let Some(a) = args.get(0) {
return if let Some(b) = args.get(1) {
match a.abstract_lt(b.to_owned(), activation)? {
Value::Bool(value) => {
if value {
Ok(b.coerce_to_f64(activation)?.into())
} else {
Ok(a.coerce_to_f64(activation)?.into())
}
}
_ => Ok(f64::NAN.into()),
let result = if let Some(a) = args.get(0) {
let a = a.coerce_to_f64(activation)?;
if let Some(b) = args.get(1) {
let b = b.coerce_to_f64(activation)?;
use std::cmp::Ordering;
match a.partial_cmp(&b) {
Some(Ordering::Less) => b,
Some(Ordering::Equal) => a,
Some(Ordering::Greater) => a,
None => f64::NAN,
}
} else {
Ok(f64::NAN.into())
f64::NAN
}
} else {
f64::NEG_INFINITY
};
}
Ok(f64::NEG_INFINITY.into())
Ok(result.into())
}
fn min<'gc>(
@ -127,23 +128,24 @@ fn min<'gc>(
_this: Object<'gc>,
args: &[Value<'gc>],
) -> Result<Value<'gc>, Error<'gc>> {
if let Some(a) = args.get(0) {
return if let Some(b) = args.get(1) {
match a.abstract_lt(b.to_owned(), activation)? {
Value::Bool(value) => {
if value {
Ok(a.coerce_to_f64(activation)?.into())
} else {
Ok(b.coerce_to_f64(activation)?.into())
}
}
_ => Ok(f64::NAN.into()),
let result = if let Some(a) = args.get(0) {
let a = a.coerce_to_f64(activation)?;
if let Some(b) = args.get(1) {
let b = b.coerce_to_f64(activation)?;
use std::cmp::Ordering;
match a.partial_cmp(&b) {
Some(Ordering::Less) => a,
Some(Ordering::Equal) => a,
Some(Ordering::Greater) => b,
None => f64::NAN,
}
} else {
Ok(f64::NAN.into())
f64::NAN
}
} else {
f64::INFINITY
};
}
Ok(f64::INFINITY.into())
Ok(result.into())
}
pub fn random<'gc>(