Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(webidl): enforce integer ranges after truncation

ldm059ed855b9d48
diff --git a/moli-renderer-v8/src/worker/thread/tests/network.rs b/moli-renderer-v8/src/worker/thread/tests/network.rs
index b58e6f6a1..b90ba1add 100644
--- a/moli-renderer-v8/src/worker/thread/tests/network.rs
+++ b/moli-renderer-v8/src/worker/thread/tests/network.rs
@@ -997,7 +997,7 @@ async fn worker_opfs_sync_shared_modes_enforce_compatibility_and_write_permissio
}
#[tokio::test]
-async fn worker_opfs_unsafe_handles_keep_separate_cursors_and_reject_host_file_overflow() {
+async fn worker_opfs_unsafe_handles_keep_separate_cursors_and_enforce_offset_range() {
ensure_v8();
let mut handle = spawn_worker(
r#"
@@ -1027,8 +1027,8 @@ async fn worker_opfs_unsafe_handles_keep_separate_cursors_and_reject_host_file_o
first.write(new TextEncoder().encode("C"));
second.write(new TextEncoder().encode("Z"));
- const huge = 2 ** 63;
- const nearLimit = huge - 1024;
+ const huge = 2 ** 53;
+ const nearLimit = Number.MAX_SAFE_INTEGER;
const bounds = [
thrownName(() => first.read(new Uint8Array(0), { at: huge })),
thrownName(() => first.write(new Uint8Array(0), { at: huge })),
diff --git a/moli-webidl/src/convert.rs b/moli-webidl/src/convert.rs
index 7cf538307..1bc7620c6 100644
--- a/moli-webidl/src/convert.rs
+++ b/moli-webidl/src/convert.rs
@@ -1303,33 +1303,37 @@ fn unsigned_long_long(value: f64) -> u64 {
}
fn enforce_range_unsigned_long_long(value: f64, context: Context) -> Result<u64, WebIdlError> {
- if !value.is_finite() || value < 0.0 || value >= 2f64.powi(64) {
+ // ConvertToInt uses the exact JavaScript integer range for 64-bit types.
+ let value = value.trunc();
+ if !value.is_finite() || !(0.0..=9_007_199_254_740_991.0).contains(&value) {
return Err(WebIdlError::new(
context,
WebIdlErrorKind::CannotConvert("[EnforceRange] unsigned long long"),
));
}
- Ok(value.trunc() as u64)
+ Ok(value as u64)
}
fn enforce_range_unsigned_long(value: f64, context: Context) -> Result<u32, WebIdlError> {
+ let value = value.trunc();
if !value.is_finite() || value < 0.0 || value >= 2f64.powi(32) {
return Err(WebIdlError::new(
context,
WebIdlErrorKind::CannotConvert("[EnforceRange] unsigned long"),
));
}
- Ok(value.trunc() as u32)
+ Ok(value as u32)
}
fn enforce_range_long(value: f64, context: Context) -> Result<i32, WebIdlError> {
+ let value = value.trunc();
if !value.is_finite() || value < -(2f64.powi(31)) || value >= 2f64.powi(31) {
return Err(WebIdlError::new(
context,
WebIdlErrorKind::CannotConvert("[EnforceRange] long"),
));
}
- Ok(value.trunc() as i32)
+ Ok(value as i32)
}
fn long(value: f64) -> i32 {
@@ -1410,9 +1414,17 @@ mod tests {
let context = Context::argument("IDBFactory.open", 2);
assert!(enforce_range_unsigned_long_long(f64::NAN, context).is_err());
assert!(enforce_range_unsigned_long_long(f64::INFINITY, context).is_err());
+ assert!(enforce_range_unsigned_long_long(f64::NEG_INFINITY, context).is_err());
assert!(enforce_range_unsigned_long_long(-1.0, context).is_err());
+ assert!(enforce_range_unsigned_long_long(2f64.powi(53), context).is_err());
assert!(enforce_range_unsigned_long_long(2f64.powi(64), context).is_err());
assert_eq!(enforce_range_unsigned_long_long(1.9, context).unwrap(), 1);
+ assert_eq!(enforce_range_unsigned_long_long(-0.9, context).unwrap(), 0);
+ assert_eq!(enforce_range_unsigned_long_long(-0.0, context).unwrap(), 0);
+ assert_eq!(
+ enforce_range_unsigned_long_long(9_007_199_254_740_991.0, context).unwrap(),
+ 9_007_199_254_740_991
+ );
}
#[test]
@@ -1420,9 +1432,16 @@ mod tests {
let context = Context::argument("IDBCursor.advance", 1);
assert!(enforce_range_unsigned_long(f64::NAN, context).is_err());
assert!(enforce_range_unsigned_long(f64::INFINITY, context).is_err());
+ assert!(enforce_range_unsigned_long(f64::NEG_INFINITY, context).is_err());
assert!(enforce_range_unsigned_long(-1.0, context).is_err());
assert!(enforce_range_unsigned_long(2f64.powi(32), context).is_err());
assert_eq!(enforce_range_unsigned_long(1.9, context).unwrap(), 1);
+ assert_eq!(enforce_range_unsigned_long(-0.9, context).unwrap(), 0);
+ assert_eq!(enforce_range_unsigned_long(-0.0, context).unwrap(), 0);
+ assert_eq!(
+ enforce_range_unsigned_long(4_294_967_295.9, context).unwrap(),
+ u32::MAX
+ );
}
#[test]
@@ -1430,10 +1449,20 @@ mod tests {
let context = Context::argument("CanvasRenderingContext2D.getImageData", 1);
assert!(enforce_range_long(f64::NAN, context).is_err());
assert!(enforce_range_long(f64::INFINITY, context).is_err());
+ assert!(enforce_range_long(f64::NEG_INFINITY, context).is_err());
assert!(enforce_range_long(-(2f64.powi(31)) - 1.0, context).is_err());
assert!(enforce_range_long(2f64.powi(31), context).is_err());
assert_eq!(enforce_range_long(-1.9, context).unwrap(), -1);
assert_eq!(enforce_range_long(1.9, context).unwrap(), 1);
+ assert_eq!(enforce_range_long(-0.0, context).unwrap(), 0);
+ assert_eq!(
+ enforce_range_long(-2_147_483_648.9, context).unwrap(),
+ i32::MIN
+ );
+ assert_eq!(
+ enforce_range_long(2_147_483_647.9, context).unwrap(),
+ i32::MAX
+ );
}
#[test]