summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2020-06-11 16:38:41 +0200
committerDavid Lönnhager <david.l@mullvad.net>2020-06-12 09:10:43 +0200
commitbc94295f612cb319dfd69acc43473b2a81497112 (patch)
tree325025a91a38922f3faa89260b74e17817d6c1b4
parent752b0b83a0cf47c27e9b032f5153a83202678217 (diff)
downloadmullvadvpn-bc94295f612cb319dfd69acc43473b2a81497112.tar.xz
mullvadvpn-bc94295f612cb319dfd69acc43473b2a81497112.zip
Improve error handling
-rw-r--r--talpid-ipc/src/win.rs12
1 files changed, 2 insertions, 10 deletions
diff --git a/talpid-ipc/src/win.rs b/talpid-ipc/src/win.rs
index 0549368bf8..0b39282348 100644
--- a/talpid-ipc/src/win.rs
+++ b/talpid-ipc/src/win.rs
@@ -143,11 +143,7 @@ pub fn deny_network_access<T: AsRef<OsStr>>(ipc_path: T) -> Result<(), io::Error
)
};
if result != ERROR_SUCCESS {
- // A non-zero error code in WinError.h
- return Err(io::Error::new(
- io::ErrorKind::Other,
- format!("SetEntriesInAclW failed: {}", result),
- ));
+ return Err(io::Error::from_raw_os_error(result as i32));
}
let result = unsafe {
@@ -165,11 +161,7 @@ pub fn deny_network_access<T: AsRef<OsStr>>(ipc_path: T) -> Result<(), io::Error
unsafe { LocalFree(new_dacl as *mut _) };
if result != ERROR_SUCCESS {
- // A non-zero error code in WinError.h
- return Err(io::Error::new(
- io::ErrorKind::Other,
- format!("SetSecurityInfo failed: {}", result),
- ));
+ return Err(io::Error::from_raw_os_error(result as i32));
}
Ok(())