scovich commented on code in PR #7752:
URL: https://github.com/apache/arrow-rs/pull/7752#discussion_r2164832163
##########
parquet-variant/src/utils.rs:
##########
@@ -33,17 +38,33 @@ pub(crate) fn slice_from_slice<I: SliceIndex<[u8]> + Clone
+ Debug>(
))
})
}
+
+/// Helper to safely slice bytes with offset calculations.
+///
+/// Equivalent to `slice_from_slice(bytes, (base_offset +
range.start)..(base_offset + range.end))`
+/// but using checked addition to prevent integer overflow panics on 32-bit
systems.
+#[inline]
+pub(crate) fn slice_from_slice_at_offset(
+ bytes: &[u8],
+ base_offset: usize,
+ range: Range<usize>,
+) -> Result<&[u8], ArrowError> {
+ let start_byte = base_offset
+ .checked_add(range.start)
+ .ok_or_else(|| overflow_error("slice start"))?;
+ let end_byte = base_offset
+ .checked_add(range.end)
+ .ok_or_else(|| overflow_error("slice end"))?;
+ slice_from_slice(bytes, start_byte..end_byte)
+}
+
pub(crate) fn array_from_slice<const N: usize>(
bytes: &[u8],
offset: usize,
) -> Result<[u8; N], ArrowError> {
- let bytes = slice_from_slice(bytes, offset..offset + N)?;
- bytes.try_into().map_err(map_try_from_slice_error)
-}
-
-/// To be used in `map_err` when unpacking an integer from a slice of bytes.
-pub(crate) fn map_try_from_slice_error(e: TryFromSliceError) -> ArrowError {
- ArrowError::InvalidArgumentError(e.to_string())
+ slice_from_slice_at_offset(bytes, offset, 0..N)?
+ .try_into()
+ .map_err(|e: TryFromSliceError|
ArrowError::InvalidArgumentError(e.to_string()))
Review Comment:
This `try_into` will always succeed because we hard-wire the `0..N` to match
the `[u8; N]`.
Should we `unwrap` instead of `map_err`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
