Only enable stack overflow exception detection if the system supports it

Author: seritools

library/std/src/sys/windows/c.rs

@@ -443,13 +443,19 @@ compat_fn_with_fallback! {
 // Where possible, these definitions should be kept in sync with https://docs.rs/windows-sys
 cfg_if::cfg_if! {
 if #[cfg(not(target_vendor = "uwp"))] {
-    #[link(name = "kernel32")]
-    extern "system" {
+    compat_fn_optional! {
+        crate::sys::compat::load_stack_overflow_functions();
+        // >= Vista / Server 2003
+        // https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setthreadstackguarantee
+        pub fn SetThreadStackGuarantee(stacksizeinbytes: *mut u32) -> BOOL;
+        // >= XP
+        // https://docs.microsoft.com/en-us/windows/win32/api/errhandlingapi/nf-errhandlingapi-addvectoredexceptionhandler
         pub fn AddVectoredExceptionHandler(
             first: u32,
             handler: PVECTORED_EXCEPTION_HANDLER,
         ) -> *mut c_void;
     }
+
     pub type PVECTORED_EXCEPTION_HANDLER = Option<
         unsafe extern "system" fn(exceptioninfo: *mut EXCEPTION_POINTERS) -> i32,
     >;

library/std/src/sys/windows/compat.rs

@@ -65,6 +65,8 @@ unsafe extern "C" fn init() {
 
     // Attempt to preload the synch functions.
     load_synch_functions();
+    #[cfg(not(target_vendor = "uwp"))]
+    load_stack_overflow_functions();
 }
 
 /// Helper macro for creating CStrs from literals and symbol names.
@@ -360,7 +362,10 @@ macro_rules! static_load {
         [$($symbol:ident),* $(,)?]
     ) => {
         $(
-            let $symbol = $library.proc_address(ansi_str!(sym $symbol))?;
+            let $symbol = {
+                const $symbol: &CStr = ansi_str!(sym $symbol);
+                $library.proc_address($symbol)?
+            };
         )*
         $(
             c::$symbol::PTR.store($symbol.as_ptr(), Ordering::Relaxed);
@@ -383,3 +388,20 @@ pub(super) fn load_synch_functions() {
 
     try_load();
 }
+
+#[cfg(not(target_vendor = "uwp"))]
+pub(super) fn load_stack_overflow_functions() {
+    fn try_load() -> Option<()> {
+        const MODULE_NAME: &CStr = c"kernel32";
+
+        // Try loading the library and all the required functions.
+        // If any step fails, then they all fail.
+        let library = unsafe { Module::new(MODULE_NAME) }?;
+
+        static_load!(library, [SetThreadStackGuarantee, AddVectoredExceptionHandler]);
+
+        Some(())
+    }
+
+    try_load();
+}

library/std/src/sys/windows/stack_overflow.rs

@@ -9,13 +9,12 @@ pub struct Handler;
 
 impl Handler {
     pub unsafe fn new() -> Handler {
-        // This API isn't available on XP, so don't panic in that case and just
-        // pray it works out ok.
-        if c::SetThreadStackGuarantee(&mut 0x5000) == 0
-            && api::get_last_error().code != c::ERROR_CALL_NOT_IMPLEMENTED
-        {
-            panic!("failed to reserve stack space for exception handling");
-        }
+        if let Some(f) = c::SetThreadStackGuarantee::option() {
+            if f(&mut 0x5000) == 0 && api::get_last_error().code != c::ERROR_CALL_NOT_IMPLEMENTED {
+                panic!("failed to reserve stack space for exception handling");
+            }
+        };
+
         Handler
     }
 }
@@ -36,7 +35,11 @@ unsafe extern "system" fn vectored_handler(ExceptionInfo: *mut c::EXCEPTION_POIN
 }
 
 pub unsafe fn init() {
-    if c::AddVectoredExceptionHandler(0, Some(vectored_handler)).is_null() {
+    let Some(f) = c::AddVectoredExceptionHandler::option() else {
+        return;
+    };
+
+    if f(0, Some(vectored_handler)).is_null() {
         panic!("failed to install exception handler");
     }
     // Set the thread stack guarantee for the main thread.