Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion Lib/test/test_bytes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1862,7 +1862,6 @@ def test_partition_bytearray_doesnt_share_nullstring(self):
self.assertEqual(b, b"")
self.assertEqual(c, b"")

@unittest.expectedFailure # TODO: RUSTPYTHON; BufferError: Existing exports of data: object cannot be re-sized
def test_resize_forbidden(self):
# #4509: can't resize a bytearray when there are buffer exports, even
# if it wouldn't reallocate the underlying buffer.
Expand Down
13 changes: 12 additions & 1 deletion crates/vm/src/builtins/bytearray.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1027,8 +1027,19 @@ impl Py<PyByteArray> {
if size < 0 {
return Err(vm.new_value_error("bytearray.resize(): new size must be >= 0"));
}
let mut inner = self.try_resizable(vm)?;
let size = size as usize;
// An export's stable length avoids re-entering the payload lock.
let access = self.resize_access();
let len = match &access {
ResizeAccess::Exclusive(inner) => inner.elements.len(),
ResizeAccess::Exported { len } => *len,
};
if size == len {
return Ok(());
}
let ResizeAccess::Exclusive(mut inner) = access else {
return Err(vm.new_buffer_error("Existing exports of data: object cannot be re-sized"));
};
let elements = &mut inner.elements;
elements
.try_reserve_exact(size.saturating_sub(elements.len()))
Expand Down
Loading