crtxcr
/
raou
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fixed getpwnam problems related to ptr lifecycle

This commit is contained in:
Albert S. 2020-07-09 00:11:50 +02:00
parent 9dd18734d6
commit 1c03d47dac
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@ -75,11 +75,13 @@ fn getpwnam(username: &str) -> std::io::Result<Passwd> {
fn getstr(str: *mut libc::c_char) -> String { fn getstr(str: *mut libc::c_char) -> String {
unsafe { CStr::from_ptr(str).to_string_lossy().into_owned() } unsafe { CStr::from_ptr(str).to_string_lossy().into_owned() }
} }
unsafe { let username_c = CString::new(username).unwrap();
let pwnamresult: *mut passwd = libc::getpwnam(CString::new(username).unwrap().as_ptr()); let username_ptr = username_c.as_ptr();
let pwnamresult: *mut libc::passwd = unsafe { libc::getpwnam(username_ptr) };
if pwnamresult.is_null() { 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 { Ok(Passwd {
pw_name: getstr((*pwnamresult).pw_name), pw_name: getstr((*pwnamresult).pw_name),
pw_passwd: getstr((*pwnamresult).pw_passwd), pw_passwd: getstr((*pwnamresult).pw_passwd),