quantumclaw/clawhdf5
3
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

format: no truncating u64 -> usize casts in gather_storage and ExtentBytes

Browse Source 
check-32bit-casts.sh flagged two casts added by the previous commits; both
values are bounded (checked by gather_storage's first walk, and built from
a usize fetch length), so they go through addr::saturating_usize.

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
osobh
2026-09-26 19:05:45 -05:00
co-authored by Claude Opus 5.5
parent 75444950f3
commit ea0508aaa5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/clawhdf5-format/src/gather.rs
+3 -3
View File
@@ -454,9 +454,9 @@ pub(crate) fn gather_storage<S: Storage + ?Sized>(
if error.is_some() { if error.is_some() {
return; return;
} }
// Checked by the first walk. // Checked by the first walk (these cannot saturate or wrap).
let mut at = first as usize * elem_size; let mut at = crate::addr::saturating_usize(first).wrapping_mul(elem_size);
let mut len = n as usize * elem_size; let mut len = crate::addr::saturating_usize(n).wrapping_mul(elem_size);
while len > 0 { while len > 0 {
while spans.get(span).is_some_and(|s| s.out_end <= out.len()) { while spans.get(span).is_some_and(|s| s.out_end <= out.len()) {
span += 1; span += 1;
crates/clawhdf5-format/src/storage.rs
+2 -1
View File
@@ -477,7 +477,8 @@ impl<'a> ExtentBytes<'a> {
)); ));
} }
for ((slot, bytes), r) in slots.into_iter().zip(got).zip(&ranges) { for ((slot, bytes), r) in slots.into_iter().zip(got).zip(&ranges) {
out[slot] = Extent::Bytes(exact_len(bytes, (r.end - r.start) as usize)?); let len = crate::addr::saturating_usize(r.end - r.start);
out[slot] = Extent::Bytes(exact_len(bytes, len)?);
} }
} }
Ok(ExtentBytes::Fetched { base, extents: out }) Ok(ExtentBytes::Fetched { base, extents: out })