std: maintain CStringArray null-termination even if Vec::push panics

This commit is contained in:
joboet
2026-04-25 15:17:36 +02:00
parent 7e0430fafc
commit bab4983f6c
@@ -35,10 +35,12 @@ pub fn write(&mut self, index: usize, item: CString) {
/// Push an additional string to the array.
pub fn push(&mut self, item: CString) {
let argc = self.ptrs.len() - 1;
// Replace the null pointer at the end of the array...
self.ptrs[argc] = item.into_raw();
// ... and recreate it to restore the data structure invariant.
// Amend the array by another null pointer first, to ensure that the
// array is null-terminated even when the `push` panics, in which case
// the array will be left undisturbed (see #155748).
self.ptrs.push(ptr::null());
// Now, replace the previous null pointer.
self.ptrs[argc] = item.into_raw();
}
/// Returns a pointer to the C-string array managed by this type.