File tree 1 file changed +16
-4
lines changed
1 file changed +16
-4
lines changed Original file line number Diff line number Diff line change @@ -3735,11 +3735,23 @@ impl From<&libc::group> for Group {
3735
3735
fn from( gr: & libc:: group) -> Group {
3736
3736
unsafe {
3737
3737
Group {
3738
- name: CStr :: from_ptr( gr. gr_name) . to_string_lossy( ) . into_owned( ) ,
3739
- passwd: CString :: new( CStr :: from_ptr( gr. gr_passwd) . to_bytes( ) )
3740
- . unwrap( ) ,
3738
+ name: if gr. gr_name. is_null( ) {
3739
+ Default :: default ( )
3740
+ } else {
3741
+ CStr :: from_ptr( gr. gr_name) . to_string_lossy( ) . into_owned( )
3742
+ } ,
3743
+ passwd: if gr. gr_passwd. is_null( ) {
3744
+ Default :: default ( )
3745
+ } else {
3746
+ CString :: new( CStr :: from_ptr( gr. gr_passwd) . to_bytes( ) )
3747
+ . unwrap( )
3748
+ } ,
3741
3749
gid: Gid :: from_raw( gr. gr_gid) ,
3742
- mem: Group :: members( gr. gr_mem) ,
3750
+ mem: if gr. gr_mem. is_null( ) {
3751
+ Default :: default ( )
3752
+ } else {
3753
+ Group :: members( gr. gr_mem)
3754
+ } ,
3743
3755
}
3744
3756
}
3745
3757
}
You can’t perform that action at this time.
0 commit comments