Skip to content

Use CStr::from_bytes_until_nul for safer string conversion #437

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
simonrw wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use CStr::from_bytes_until_nul for safer string conversion #437

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
7 changes: 5 additions & 2 deletions fitsio/src/stringutils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
use libc::{c_char, c_int, size_t};
use std::ffi::{CStr, CString};

/// Helper function converting a C string pointer to Rust String
/// Helper function converting a C string buffer to Rust String
pub fn buf_to_string(buffer: &[c_char]) -> Result<String> {
let c_str = unsafe { CStr::from_ptr(buffer.as_ptr()) };
// Safety: c_char and u8 have the same size and alignment
let bytes: &[u8] = unsafe { std::slice::from_raw_parts(buffer.as_ptr() as *const u8, buffer.len()) };
let c_str = CStr::from_bytes_until_nul(bytes)

Check failure on line 10 in fitsio/src/stringutils.rs

View workflow job for this annotation

GitHub Actions / minimal versions check 

current MSRV (Minimum Supported Rust Version) is `1.58.0` but this item is stable since `1.69.0`
.map_err(|_| crate::errors::Error::Message("buffer is not null-terminated".to_string()))?;
Ok(c_str.to_str()?.to_string())
}

Expand Down
Loading