dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(syntax): prevent creating invalid u32 IDs (#4675)

Browse source 
Panic if try to create an `AstNodeId`, `ReferenceId`, `ScopeId` or `SymbolId` from a `usize` which can't be stored as a `u32`.

Previously we checked for `u32::MAX`, but didn't check for numbers larger than that.
This commit is contained in:
overlookmotel 2024-08-06 01:04:07 +00:00
parent e3abdfa379
commit 9f8f2997c4
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/oxc_syntax/src/node.rs
View file

@ -38,7 +38,9 @@ impl AstNodeId {
impl Idx for AstNodeId { impl Idx for AstNodeId {
#[allow(clippy::cast_possible_truncation)] #[allow(clippy::cast_possible_truncation)]
fn from_usize(idx: usize) -> Self { fn from_usize(idx: usize) -> Self {
Self(NonMaxU32::new(idx as u32).unwrap()) assert!(idx < u32::MAX as usize);
// SAFETY: We just checked `idx` is valid for `NonMaxU32`
Self(unsafe { NonMaxU32::new_unchecked(idx as u32) })
} }
fn index(self) -> usize { fn index(self) -> usize {

4
crates/oxc_syntax/src/reference.rs
View file

@ -11,7 +11,9 @@ pub struct ReferenceId(NonMaxU32);
impl Idx for ReferenceId { impl Idx for ReferenceId {
#[allow(clippy::cast_possible_truncation)] #[allow(clippy::cast_possible_truncation)]
fn from_usize(idx: usize) -> Self { fn from_usize(idx: usize) -> Self {
Self(NonMaxU32::new(idx as u32).unwrap()) assert!(idx < u32::MAX as usize);
// SAFETY: We just checked `idx` is valid for `NonMaxU32`
Self(unsafe { NonMaxU32::new_unchecked(idx as u32) })
} }
fn index(self) -> usize { fn index(self) -> usize {

4
crates/oxc_syntax/src/scope.rs
View file

@ -35,7 +35,9 @@ impl ScopeId {
impl Idx for ScopeId { impl Idx for ScopeId {
#[allow(clippy::cast_possible_truncation)] #[allow(clippy::cast_possible_truncation)]
fn from_usize(idx: usize) -> Self { fn from_usize(idx: usize) -> Self {
Self(NonMaxU32::new(idx as u32).unwrap()) assert!(idx < u32::MAX as usize);
// SAFETY: We just checked `idx` is valid for `NonMaxU32`
Self(unsafe { NonMaxU32::new_unchecked(idx as u32) })
} }
fn index(self) -> usize { fn index(self) -> usize {

4
crates/oxc_syntax/src/symbol.rs
View file

@ -11,7 +11,9 @@ pub struct SymbolId(NonMaxU32);
impl Idx for SymbolId { impl Idx for SymbolId {
#[allow(clippy::cast_possible_truncation)] #[allow(clippy::cast_possible_truncation)]
fn from_usize(idx: usize) -> Self { fn from_usize(idx: usize) -> Self {
Self(NonMaxU32::new(idx as u32).unwrap()) assert!(idx < u32::MAX as usize);
// SAFETY: We just checked `idx` is valid for `NonMaxU32`
Self(unsafe { NonMaxU32::new_unchecked(idx as u32) })
} }
fn index(self) -> usize { fn index(self) -> usize {