Skip to content

prevent slice::from_raw_parts from being passed a null pointer #1380

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

Open
z-erica wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prevent slice::from_raw_parts from being passed a null pointer #1380

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
9 changes: 7 additions & 2 deletions crates/bridge_fontconfig/src/font_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ impl<'a> FontSetRef<'a> {
let ptr = unsafe { (*self.as_ptr()).fonts.cast() };
// SAFETY: Internal pointer guaranteed valid
let len = unsafe { (*self.as_ptr()).nfont } as usize;
// SAFETY: Fonts pointer guaranteed to be to a valid array of length nfont
unsafe { slice::from_raw_parts(ptr, len) }
if len == 0 {
// slice::from_raw_parts can't take a null pointer, even if the length is zero
&[]
} else {
// SAFETY: Fonts pointer guaranteed to be to a valid array of length nfont
unsafe { slice::from_raw_parts(ptr, len) }
}
}
}

Expand Down
Loading