OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #36018 - durka:patch-28, r=steveklabnik

Browse Source 
strengthen doc warning about CString::from_raw

Saw unsound code using this function on IRC.
This commit is contained in:
Guillaume Gomez 2016-09-24 00:15:43 +02:00 committed by GitHub
commit f45283b93e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstd/ffi/c_str.rs
View File

@ -228,9 +228,14 @@ impl CString {
/// Retakes ownership of a `CString` that was transferred to C. /// Retakes ownership of a `CString` that was transferred to C.
/// ///
/// Additionally, the length of the string will be recalculated from the pointer.
///
/// # Safety
///
/// This should only ever be called with a pointer that was earlier /// This should only ever be called with a pointer that was earlier
/// obtained by calling `into_raw` on a `CString`. Additionally, the length /// obtained by calling `into_raw` on a `CString`. Other usage (e.g. trying to take
/// of the string will be recalculated from the pointer. /// ownership of a string that was allocated by foreign code) is likely to lead
/// to undefined behavior or allocator corruption.
#[stable(feature = "cstr_memory", since = "1.4.0")] #[stable(feature = "cstr_memory", since = "1.4.0")]
pub unsafe fn from_raw(ptr: *mut c_char) -> CString { pub unsafe fn from_raw(ptr: *mut c_char) -> CString {
let len = libc::strlen(ptr) + 1; // Including the NUL byte let len = libc::strlen(ptr) + 1; // Including the NUL byte