mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

rust: Handle null pointer when creating slice

Browse Source 
Starting with Rust 1.78 null assertions in the standard library are
now checked when compiling in test/debug mode.

Fixes: https://github.com/libguestfs/libguestfs/issues/145
This commit is contained in:
Jürgen Hötzel
2024-06-20 13:27:51 +01:00
committed by Richard W.M. Jones
parent 893c05fc40
commit 43946911c7
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rust/src/event.rs
View File

@@ -105,8 +105,16 @@ impl<'a> base::Handle<'a> {
None => panic!("Failed to parse bitmask: {}", event),
};
let eh = EventHandle { eh: event_handle };
let buf = unsafe { slice::from_raw_parts(buf as *const u8, buf_len) };
let array = unsafe { slice::from_raw_parts(array, array_len) };
let buf = if !buf.is_null() {
unsafe { slice::from_raw_parts(buf as *const u8, buf_len) }
} else {
&[]
};
let array = if !array.is_null() {
unsafe { slice::from_raw_parts(array, array_len) }
} else {
&[]
};
let callback: &Box<dyn Fn(guestfs::Event, EventHandle, &[u8], &[u64])> =
Box::leak(unsafe { Box::from_raw(opaque as *mut _) });