fix: Date parse 年号上限防溢出

This commit is contained in:
2026-10-15 16:19:38 +00:00
parent 7ec975cfb4
commit 0af2db45b2
4 changed files with 39 additions and 22 deletions
Generated
+21 -21
View File
@@ -1160,7 +1160,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_builtins" name = "oxide_builtins"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"chrono", "chrono",
"fast-float", "fast-float",
@@ -1185,7 +1185,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_bytecode" name = "oxide_bytecode"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxide_log", "oxide_log",
@@ -1193,7 +1193,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cfg" name = "oxide_cfg"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_emit", "oxide_emit",
@@ -1204,7 +1204,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_cli" name = "oxide_cli"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"bumpalo", "bumpalo",
@@ -1228,7 +1228,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_code_cache" name = "oxide_code_cache"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"lru", "lru",
"oxide_bytecode", "oxide_bytecode",
@@ -1237,7 +1237,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_compiler" name = "oxide_compiler"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1258,7 +1258,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_dce" name = "oxide_dce"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1272,7 +1272,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_emit" name = "oxide_emit"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxc_allocator", "oxc_allocator",
@@ -1288,7 +1288,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_engine" name = "oxide_engine"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_compiler", "oxide_compiler",
@@ -1300,7 +1300,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_fold" name = "oxide_fold"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"oxide_bytecode", "oxide_bytecode",
@@ -1312,7 +1312,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_ir" name = "oxide_ir"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_log", "oxide_log",
@@ -1321,7 +1321,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_kernel" name = "oxide_kernel"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"dashmap", "dashmap",
@@ -1335,7 +1335,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_liveness" name = "oxide_liveness"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1347,7 +1347,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_log" name = "oxide_log"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"tracing", "tracing",
"tracing-appender", "tracing-appender",
@@ -1356,11 +1356,11 @@ dependencies = [
[[package]] [[package]]
name = "oxide_net" name = "oxide_net"
version = "0.19.18" version = "0.19.19"
[[package]] [[package]]
name = "oxide_parser" name = "oxide_parser"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"oxc_allocator", "oxc_allocator",
"oxc_ast", "oxc_ast",
@@ -1375,7 +1375,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_regalloc" name = "oxide_regalloc"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_cfg", "oxide_cfg",
@@ -1391,7 +1391,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_runtime_api" name = "oxide_runtime_api"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"num-traits", "num-traits",
@@ -1404,7 +1404,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_test262" name = "oxide_test262"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"oxide_bytecode", "oxide_bytecode",
"oxide_compiler", "oxide_compiler",
@@ -1424,7 +1424,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_types" name = "oxide_types"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"dashmap", "dashmap",
@@ -1437,7 +1437,7 @@ dependencies = [
[[package]] [[package]]
name = "oxide_vm" name = "oxide_vm"
version = "0.19.18" version = "0.19.19"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"chrono", "chrono",
+1 -1
View File
@@ -25,7 +25,7 @@ members = [
] ]
[workspace.package] [workspace.package]
version = "0.19.18" version = "0.19.19"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
rust-version = "1.80" rust-version = "1.80"
+6
View File
@@ -594,6 +594,8 @@ fn two_digits(b: &[u8]) -> Option<i64> {
/// - 两种形态:`Www Mmm DD YYYY HH:MM:SS GMT±HHMM`(toString)与 /// - 两种形态:`Www Mmm DD YYYY HH:MM:SS GMT±HHMM`(toString)与
/// `Www, DD Mmm YYYY HH:MM:SS GMT`(toUTCString);星期名不校验。 /// `Www, DD Mmm YYYY HH:MM:SS GMT`(toUTCString);星期名不校验。
/// - 年号带符号(负年 `-` 前缀),时分秒与偏移均按十进制数字解析。 /// - 年号带符号(负年 `-` 前缀),时分秒与偏移均按十进制数字解析。
/// - 年号超出 ±275760(TimeClip 包络可表示的极端年)必越界,按不可解析
/// 处理返回 None,日数乘积随之有界,不溢出 i64。
fn parse_engine_date_string(s: &str) -> Option<f64> { fn parse_engine_date_string(s: &str) -> Option<f64> {
let tokens: Vec<&str> = s.split_whitespace().collect(); let tokens: Vec<&str> = s.split_whitespace().collect();
if tokens.len() != 6 { if tokens.len() != 6 {
@@ -607,6 +609,10 @@ fn parse_engine_date_string(s: &str) -> Option<f64> {
let m = MONTH_NAMES.iter().position(|n| *n == mon_s)? as i64 + 1; let m = MONTH_NAMES.iter().position(|n| *n == mon_s)? as i64 + 1;
let d = two_digits(day_s.as_bytes())?; let d = two_digits(day_s.as_bytes())?;
let y = parse_signed_year(year_s)?; 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 (h, mi, sec) = parse_hms(time_s)?;
let offset_min = if off_s == "GMT" { let offset_min = if off_s == "GMT" {
0 0
@@ -1085,6 +1085,17 @@ fn date_parse_invalid_calendar_rejected() {
assert!(r.as_double().is_nan()); 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 边界 ── // ── toISOString 6 位年与 TimeClip 边界 ──
#[test] #[test]