Skip to content

Guard plugin longjmp when jump buffer isn’t primed #12589

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

Open
Rtur2003 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −0
Open

Guard plugin longjmp when jump buffer isn’t primed #12589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/managers/HookSystemManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ void CHookSystemManager::emit(std::vector<SCallbackFNPtr>* const callbacks, SCal
continue;

try {
m_hookFaultJumpBufReady = true;
if (!setjmp(m_hookFaultJumpBuf)) {
if (SP<HOOK_CALLBACK_FN> fn = cb.fn.lock())
(*fn)(fn.get(), info, data);
Expand All @@ -63,7 +64,11 @@ void CHookSystemManager::emit(std::vector<SCallbackFNPtr>* const callbacks, SCal
// TODO: this works only once...?
faultyHandles.push_back(cb.handle);
Debug::log(ERR, "[hookSystem] Hook from plugin {:x} caused a SIGSEGV, queueing for unloading.", rc<uintptr_t>(cb.handle));
} catch (...) {
faultyHandles.push_back(cb.handle);
Debug::log(ERR, "[hookSystem] Hook from plugin {:x} caused an unknown fault, queueing for unloading.", rc<uintptr_t>(cb.handle));
}
m_hookFaultJumpBufReady = false;
}

if (needsDeadCleanup)
Expand Down
1 change: 1 addition & 0 deletions src/managers/HookSystemManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class CHookSystemManager {
std::vector<SCallbackFNPtr>* getVecForEvent(const std::string& event);

bool m_currentEventPlugin = false;
bool m_hookFaultJumpBufReady = false;
jmp_buf m_hookFaultJumpBuf;

private:
Expand Down