do not round-trip function pointer through integer

rust-lang · Apr 7, 2022 · c599a4c · c599a4c
1 parent fe85591
commit c599a4c
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/library/std/src/sys/windows/compat.rs b/library/std/src/sys/windows/compat.rs
@@ -92,11 +92,10 @@ macro_rules! compat_fn {
  let symbol_name: *const u8 = concat!(stringify!($symbol), "\0").as_ptr();
  let module_handle = $crate::sys::c::GetModuleHandleA(module_name as *const i8);
  if !module_handle.is_null() {
- match $crate::sys::c::GetProcAddress(module_handle, symbol_name as *const i8).addr() {
- 0 => {}
- n => {
- return Some(mem::transmute::<usize, F>(n));
- }
+ let ptr = $crate::sys::c::GetProcAddress(module_handle, symbol_name as *const i8);
+ if !ptr.is_null() {
+ // Transmute to the right function pointer type.
+ return Some(mem::transmute(ptr));
  }
  }
  return None;