Avoid a deadlock when registering FDEs at runtime

koute · Jun 10, 2021 · eb4097e · eb4097e
1 parent c103773
commit eb4097e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/preload/src/api.rs b/preload/src/api.rs
@@ -559,7 +559,9 @@ pub unsafe extern "C" fn __register_frame( fde: *const u8 ) {
         error!( "__register_frame call ignored since we couldn't find the original symbol" );
     }
 
+    let thread = StrongThreadHandle::acquire();
     unwind::register_frame_by_pointer( fde );
+    std::mem::drop( thread );
 }
 
 #[cfg_attr(not(test), no_mangle)]
@@ -572,5 +574,7 @@ pub unsafe extern "C" fn __deregister_frame( fde: *const u8 ) {
         error!( "__deregister_frame call ignored since we couldn't find the original symbol" );
     }
 
+    let thread = StrongThreadHandle::acquire();
     unwind::deregister_frame_by_pointer( fde );
+    std::mem::drop( thread );
 }