Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-05 22:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Return None from outlk_autodiscover if no XML config was parsed

Browse Source
This commit is contained in:
Alexander Krotov
2019-10-06 01:26:53 +03:00
parent 1802d7658d
commit d43c225be3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/configure/auto_outlook.rs
View File

@@ -38,6 +38,7 @@ pub unsafe fn outlk_autodiscover(
tag_config: 0, tag_config: 0,
config: [ptr::null_mut(); 6], config: [ptr::null_mut(); 6],
}; };
let mut out_null = true;
let ok_to_continue; let ok_to_continue;
let mut i = 0; let mut i = 0;
loop { loop {
@@ -89,6 +90,7 @@ pub unsafe fn outlk_autodiscover(
if !(!outlk_ad.config[5].is_null() if !(!outlk_ad.config[5].is_null()
&& 0 != *outlk_ad.config[5usize].offset(0isize) as libc::c_int) && 0 != *outlk_ad.config[5usize].offset(0isize) as libc::c_int)
{ {
out_null = false;
ok_to_continue = true; ok_to_continue = true;
break; break;
} }
@@ -119,7 +121,11 @@ pub unsafe fn outlk_autodiscover(
free(url as *mut libc::c_void); free(url as *mut libc::c_void);
free(xml_raw as *mut libc::c_void); free(xml_raw as *mut libc::c_void);
outlk_clean_config(&mut outlk_ad); outlk_clean_config(&mut outlk_ad);
Some(outlk_ad.out) if out_null {
None
} else {
Some(outlk_ad.out)
}
} }
unsafe fn outlk_clean_config(mut outlk_ad: *mut outlk_autodiscover_t) { unsafe fn outlk_clean_config(mut outlk_ad: *mut outlk_autodiscover_t) {