diff --git a/Cargo.lock b/Cargo.lock index 16e16962..0bcdab28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1160,7 +1160,7 @@ dependencies = [ [[package]] name = "oxide_builtins" -version = "0.19.18" +version = "0.19.19" dependencies = [ "chrono", "fast-float", @@ -1185,7 +1185,7 @@ dependencies = [ [[package]] name = "oxide_bytecode" -version = "0.19.18" +version = "0.19.19" dependencies = [ "num-bigint", "oxide_log", @@ -1193,7 +1193,7 @@ dependencies = [ [[package]] name = "oxide_cfg" -version = "0.19.18" +version = "0.19.19" dependencies = [ "oxide_bytecode", "oxide_emit", @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "oxide_cli" -version = "0.19.18" +version = "0.19.19" dependencies = [ "ansi_term", "bumpalo", @@ -1228,7 +1228,7 @@ dependencies = [ [[package]] name = "oxide_code_cache" -version = "0.19.18" +version = "0.19.19" dependencies = [ "lru", "oxide_bytecode", @@ -1237,7 +1237,7 @@ dependencies = [ [[package]] name = "oxide_compiler" -version = "0.19.18" +version = "0.19.19" dependencies = [ "oxide_bytecode", "oxide_cfg", @@ -1258,7 +1258,7 @@ dependencies = [ [[package]] name = "oxide_dce" -version = "0.19.18" +version = "0.19.19" dependencies = [ "oxide_bytecode", "oxide_cfg", @@ -1272,7 +1272,7 @@ dependencies = [ [[package]] name = "oxide_emit" -version = "0.19.18" +version = "0.19.19" dependencies = [ "num-bigint", "oxc_allocator", @@ -1288,7 +1288,7 @@ dependencies = [ [[package]] name = "oxide_engine" -version = "0.19.18" +version = "0.19.19" dependencies = [ "oxide_bytecode", "oxide_compiler", @@ -1300,7 +1300,7 @@ dependencies = [ [[package]] name = "oxide_fold" -version = "0.19.18" +version = "0.19.19" dependencies = [ "num-bigint", "oxide_bytecode", @@ -1312,7 +1312,7 @@ dependencies = [ [[package]] name = "oxide_ir" -version = "0.19.18" +version = "0.19.19" dependencies = [ "oxide_bytecode", "oxide_log", @@ -1321,7 +1321,7 @@ dependencies = [ [[package]] name = "oxide_kernel" -version = "0.19.18" +version = "0.19.19" dependencies = [ "bumpalo", "dashmap", @@ -1335,7 +1335,7 @@ dependencies = [ [[package]] name = "oxide_liveness" -version = "0.19.18" +version = "0.19.19" dependencies = [ "oxide_bytecode", "oxide_cfg", @@ -1347,7 +1347,7 @@ dependencies = [ [[package]] name = "oxide_log" -version = "0.19.18" +version = "0.19.19" dependencies = [ "tracing", "tracing-appender", @@ -1356,11 +1356,11 @@ dependencies = [ [[package]] name = "oxide_net" -version = "0.19.18" +version = "0.19.19" [[package]] name = "oxide_parser" -version = "0.19.18" +version = "0.19.19" dependencies = [ "oxc_allocator", "oxc_ast", @@ -1375,7 +1375,7 @@ dependencies = [ [[package]] name = "oxide_regalloc" -version = "0.19.18" +version = "0.19.19" dependencies = [ "oxide_bytecode", "oxide_cfg", @@ -1391,7 +1391,7 @@ dependencies = [ [[package]] name = "oxide_runtime_api" -version = "0.19.18" +version = "0.19.19" dependencies = [ "num-bigint", "num-traits", @@ -1404,7 +1404,7 @@ dependencies = [ [[package]] name = "oxide_test262" -version = "0.19.18" +version = "0.19.19" dependencies = [ "oxide_bytecode", "oxide_compiler", @@ -1424,7 +1424,7 @@ dependencies = [ [[package]] name = "oxide_types" -version = "0.19.18" +version = "0.19.19" dependencies = [ "bumpalo", "dashmap", @@ -1437,7 +1437,7 @@ dependencies = [ [[package]] name = "oxide_vm" -version = "0.19.18" +version = "0.19.19" dependencies = [ "bumpalo", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 16f95766..84cf83a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ members = [ ] [workspace.package] -version = "0.19.18" +version = "0.19.19" edition = "2021" license = "MIT" rust-version = "1.80" diff --git a/crates/oxide_builtins/src/date.rs b/crates/oxide_builtins/src/date.rs index ad860aa2..057a33b2 100644 --- a/crates/oxide_builtins/src/date.rs +++ b/crates/oxide_builtins/src/date.rs @@ -594,6 +594,8 @@ fn two_digits(b: &[u8]) -> Option { /// - 两种形态:`Www Mmm DD YYYY HH:MM:SS GMT±HHMM`(toString)与 /// `Www, DD Mmm YYYY HH:MM:SS GMT`(toUTCString);星期名不校验。 /// - 年号带符号(负年 `-` 前缀),时分秒与偏移均按十进制数字解析。 +/// - 年号超出 ±275760(TimeClip 包络可表示的极端年)必越界,按不可解析 +/// 处理返回 None,日数乘积随之有界,不溢出 i64。 fn parse_engine_date_string(s: &str) -> Option { let tokens: Vec<&str> = s.split_whitespace().collect(); if tokens.len() != 6 { @@ -607,6 +609,10 @@ fn parse_engine_date_string(s: &str) -> Option { let m = MONTH_NAMES.iter().position(|n| *n == mon_s)? as i64 + 1; let d = two_digits(day_s.as_bytes())?; let y = parse_signed_year(year_s)?; + // 年号超出包络可表示的极端年必越 TimeClip 归 NaN,且日数乘积需有界防溢出。 + if !(-275_760..=275_760).contains(&y) { + return None; + } let (h, mi, sec) = parse_hms(time_s)?; let offset_min = if off_s == "GMT" { 0 diff --git a/crates/oxide_vm/tests/builtins_date_tests.rs b/crates/oxide_vm/tests/builtins_date_tests.rs index 76e31de4..a3b9678e 100644 --- a/crates/oxide_vm/tests/builtins_date_tests.rs +++ b/crates/oxide_vm/tests/builtins_date_tests.rs @@ -1085,6 +1085,17 @@ fn date_parse_invalid_calendar_rejected() { assert!(r.as_double().is_nan()); } +#[test] +fn date_parse_engine_format_year_beyond_envelope_is_nan() { + let mut vm = Vm::new(); + // 引擎自身输出形态的年号超出 TimeClip 包络:归 NaN,不 panic、不环绕。 + let r = eval(&mut vm, "Date.parse('Wed, 05 Aug 300000000 12:00:00 GMT')").unwrap(); + assert!(r.as_double().is_nan()); + // 负年同侧越界同样归 NaN。 + let r = eval(&mut vm, "Date.parse('Wed, 05 Aug -300000000 12:00:00 GMT')").unwrap(); + assert!(r.as_double().is_nan()); +} + // ── toISOString 6 位年与 TimeClip 边界 ── #[test]