Skip to content

Release struct packing buffers around conversions #9658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 1 commit into from
Nov 4, 2026
Merged

Release struct packing buffers around conversions #9658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions crates/stdlib/src/pystruct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,27 +77,27 @@ pub(crate) mod _struct {
vm: &VirtualMachine,
) -> PyResult<usize> {
let offset_from_start = if offset < 0 {
if (-offset) as usize > buffer_len {
if offset.unsigned_abs() > buffer_len {
return Err(new_struct_error(
vm,
format!("offset {offset} out of range for {buffer_len}-byte buffer"),
));
}
buffer_len - (-offset as usize)
buffer_len - offset.unsigned_abs()
} else {
let offset = offset as usize;
let (op, op_action) = if is_pack {
("pack_into", "packing")
} else {
("unpack_from", "unpacking")
};
if offset + needed > buffer_len {
if offset > buffer_len || needed > buffer_len - offset {
let msg = format!(
"{op} requires a buffer of at least {required} bytes for {op_action} {needed} \
bytes at offset {offset} (actual buffer size is {buffer_len})",
op = op,
op_action = op_action,
required = needed + offset,
required = (needed as u128) + (offset as u128),
needed = needed,
offset = offset,
buffer_len = buffer_len
Expand Down Expand Up @@ -140,7 +140,7 @@ pub(crate) mod _struct {
) -> PyResult<()> {
let format_spec = format.cached_format_spec(vm)?;
let offset = get_buffer_offset(buffer.len(), offset, format_spec.size, true, vm)?;
buffer.with_ref(|data| format_spec.pack_into(&mut data[offset..], values.into_vec(), vm))
format_spec.pack_into_buffer(&buffer, offset, values.into_vec(), vm)
}

#[pyfunction]
Expand Down Expand Up @@ -472,11 +472,9 @@ pub(crate) mod _struct {
) -> PyResult<()> {
let inner = zelf.ready(vm)?;
let offset = get_buffer_offset(buffer.len(), offset, inner.spec.size, true, vm)?;
buffer.with_ref(|data| {
inner
.spec
.pack_into(&mut data[offset..], values.into_vec(), vm)
})
inner
.spec
.pack_into_buffer(&buffer, offset, values.into_vec(), vm)
}

#[pymethod]
Expand Down
Loading
Loading