Skip to content

windows: fix vectored exception handler lifecycle for repeated thread env init/destroy #4842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lum1n0us merged 2 commits into from
Feb 27, 2026
+41 −3
Merged

windows: fix vectored exception handler lifecycle for repeated thread env init/destroy #4842

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b3af2a
Fix Windows VEH registration/removal lifecycle
kogum4 Feb 24, 2026
72810b8
Remove redundant OS_THREAD_MUTEX_INITIALIZER guards
kogum4 Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 41 additions & 3 deletions core/iwasm/common/wasm_runtime_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,19 +415,39 @@ runtime_exception_handler(EXCEPTION_POINTERS *exce_info)
}
#endif /* end of BH_PLATFORM_WINDOWS */

#ifdef BH_PLATFORM_WINDOWS
static PVOID runtime_exception_handler_handle = NULL;
static int32 runtime_exception_handler_ref_count = 0;
static korp_mutex runtime_exception_handler_lock = NULL;
#endif

static bool
runtime_signal_init()
{
#ifndef BH_PLATFORM_WINDOWS
return os_thread_signal_init(runtime_signal_handler) == 0 ? true : false;
#else
if (os_thread_signal_init() != 0)
os_mutex_lock(&runtime_exception_handler_lock);

if (os_thread_signal_init() != 0) {
os_mutex_unlock(&runtime_exception_handler_lock);
return false;
}

if (!AddVectoredExceptionHandler(1, runtime_exception_handler)) {
if (runtime_exception_handler_ref_count == 0) {
runtime_exception_handler_handle =
AddVectoredExceptionHandler(1, runtime_exception_handler);
}

if (!runtime_exception_handler_handle) {
os_thread_signal_destroy();
os_mutex_unlock(&runtime_exception_handler_lock);
return false;
}

runtime_exception_handler_ref_count++;

os_mutex_unlock(&runtime_exception_handler_lock);
#endif
return true;
}
Expand All @@ -436,7 +456,25 @@ static void
runtime_signal_destroy()
{
#ifdef BH_PLATFORM_WINDOWS
RemoveVectoredExceptionHandler(runtime_exception_handler);
os_mutex_lock(&runtime_exception_handler_lock);

if (runtime_exception_handler_ref_count > 0) {
runtime_exception_handler_ref_count--;
}

if (runtime_exception_handler_ref_count == 0
&& runtime_exception_handler_handle) {
if (RemoveVectoredExceptionHandler(runtime_exception_handler_handle)) {
runtime_exception_handler_handle = NULL;
}
else {
/* Keep the handle so future init/destroy cycles can retry remove.
* Clearing it here may leave a live callback registered forever. */
runtime_exception_handler_ref_count = 1;
}
}

os_mutex_unlock(&runtime_exception_handler_lock);
#endif
os_thread_signal_destroy();
}
Expand Down
Loading