mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 12:37:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Catch exceptions from hook callbacks & fail mod

Browse Source
This commit is contained in:
Luke Street
2026-07-08 18:27:09 -06:00
parent 312195920a
commit 2840843e3c
1 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/mods/svc/hook.cpp
+45 -6
View File
@@ -10,6 +10,8 @@
#include <algorithm>
#include <cstdint>
#include <cstring>
#include <exception>
#include <fmt/format.h>
#include <funchook.h>
#include <unordered_map>
#include <vector>
@@ -71,6 +73,18 @@ HookOptions normalize_options(const HookOptions* options) {
return *options;
}
void fail_hook_callback(ModContext* context, const char* kind, const std::exception& e) {
if (auto* mod = mod_from_context(context)) {
fail_mod(*mod, MOD_ERROR, fmt::format("Exception in {} hook callback: {}", kind, e.what()));
}
}
void fail_unknown_hook_callback(ModContext* context, const char* kind) {
if (auto* mod = mod_from_context(context)) {
fail_mod(*mod, MOD_ERROR, fmt::format("Unknown exception in {} hook callback", kind));
}
}
template <class T>
void sort_hooks(std::vector<T>& hooks) {
std::ranges::stable_sort(hooks, [](const T& a, const T& b) {
@@ -295,9 +309,20 @@ ModResult hook_dispatch_pre(
}
auto& slot = it->second;
for (auto& hook : slot.pre) {
if (hook.callback != nullptr &&
hook.callback(hook.context, args, retval, hook.options.userdata) == HOOK_SKIP_ORIGINAL)
{
if (hook.callback == nullptr) {
continue;
}
HookAction action = HOOK_CONTINUE;
try {
action = hook.callback(hook.context, args, retval, hook.options.userdata);
} catch (const std::exception& e) {
fail_hook_callback(hook.context, "pre", e);
continue;
} catch (...) {
fail_unknown_hook_callback(hook.context, "pre");
continue;
}
if (action == HOOK_SKIP_ORIGINAL) {
if (outSkipOriginal != nullptr) {
*outSkipOriginal = 1;
}
@@ -305,8 +330,16 @@ ModResult hook_dispatch_pre(
}
}
if (slot.replace.replaceCallback != nullptr) {
slot.replace.replaceCallback(
slot.replace.context, args, retval, slot.replace.options.userdata);
try {
slot.replace.replaceCallback(
slot.replace.context, args, retval, slot.replace.options.userdata);
} catch (const std::exception& e) {
fail_hook_callback(slot.replace.context, "replace", e);
return MOD_ERROR;
} catch (...) {
fail_unknown_hook_callback(slot.replace.context, "replace");
return MOD_ERROR;
}
if (outSkipOriginal != nullptr) {
*outSkipOriginal = 1;
}
@@ -326,7 +359,13 @@ ModResult hook_dispatch_post(ModContext*, void* fnAddr, void* args, void* retval
}
for (auto& hook : it->second.post) {
if (hook.postCallback != nullptr) {
hook.postCallback(hook.context, args, retval, hook.options.userdata);
try {
hook.postCallback(hook.context, args, retval, hook.options.userdata);
} catch (const std::exception& e) {
fail_hook_callback(hook.context, "post", e);
} catch (...) {
fail_unknown_hook_callback(hook.context, "post");
}
}
}
return MOD_OK;