crtxcr/raou
1
0
Förgrening 0
Kod Ärenden 2 Pull-förfrågningar Släpp Wiki Aktiviteter

Fixed getpwnam problems related to ptr lifecycle

Bläddra i källkod
This commit is contained in:
Albert S. 2020-07-09 00:11:50 +02:00
förälder 9dd18734d6
incheckning 1c03d47dac
1 ändrade filer med 5 tillägg och 3 borttagningar
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
Visa fil

@ -75,11 +75,13 @@ fn getpwnam(username: &str) -> std::io::Result<Passwd> {
fn getstr(str: *mut libc::c_char) -> String {
unsafe { CStr::from_ptr(str).to_string_lossy().into_owned() }
}
unsafe {
let pwnamresult: *mut passwd = libc::getpwnam(CString::new(username).unwrap().as_ptr());
let username_c = CString::new(username).unwrap();
let username_ptr = username_c.as_ptr();
let pwnamresult: *mut libc::passwd = unsafe { libc::getpwnam(username_ptr) };
if pwnamresult.is_null() {
return Err(Error::last_os_error());
return Err(Error::new(Error::last_os_error().kind(),"Lookup of user failed: ".to_owned() + &Error::last_os_error().to_string()));
}
unsafe {
Ok(Passwd {
pw_name: getstr((*pwnamresult).pw_name),
pw_passwd: getstr((*pwnamresult).pw_passwd),