Disable hooks before exiting

OpenByteDev · Jun 9, 2022 · 2f8b2b8 · 2f8b2b8
1 parent 6f1dd55
commit 2f8b2b8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/burnt-sushi-blocker/src/hooks.rs b/burnt-sushi-blocker/src/hooks.rs
@@ -54,8 +54,12 @@ pub fn enable(
 }
 
 pub fn disable() -> Result<(), Box<dyn std::error::Error>> {
-    unsafe { GetAddrInfoHook.disable()? };
-    unsafe { CefUrlRequestCreateHook.disable()? };
+    if GetAddrInfoHook.is_enabled() {
+        unsafe { GetAddrInfoHook.disable() }?;
+    }
+    if CefUrlRequestCreateHook.is_enabled() {
+        unsafe { CefUrlRequestCreateHook.disable()? };
+    }
     Ok(())
 }
 

diff --git a/burnt-sushi-blocker/src/lib.rs b/burnt-sushi-blocker/src/lib.rs
@@ -60,6 +60,7 @@ dll_syringe::payload_procedure! {
     fn stop_rpc() {
         let mut state = RPC_STATE.lock().unwrap();
         if let Some(state) = state.take() {
+            hooks::disable().unwrap();
             state.rpc_disconnector.send(()).unwrap();
             state.rpc_thread.join().unwrap();
         }