Skip to content

Prevent plugins from freeing active private forward handle #1043

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

Closed
wants to merge 1 commit into from
Closed

Prevent plugins from freeing active private forward handle #1043

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
12 changes: 12 additions & 0 deletions core/logic/smn_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <IForwardSys.h>
#include <ISourceMod.h>
#include <amtl/am-autoptr.h>
#include "AutoHandleRooter.h"

HandleType_t g_GlobalFwdType = 0;
HandleType_t g_PrivateFwdType = 0;
Expand All @@ -43,6 +44,7 @@ static bool s_CallStarted = false;
static ICallable *s_pCallable = NULL;
static IPluginFunction *s_pFunction = NULL;
static IForward *s_pForward = NULL;
static Handle_t s_ForwardHndl = BAD_HANDLE;

class ForwardNativeHelpers :
public SMGlobalClass,
Expand Down Expand Up @@ -102,6 +104,12 @@ inline void ResetCall()
s_pFunction = NULL;
s_pForward = NULL;
s_pCallable = NULL;
if (s_ForwardHndl != BAD_HANDLE)
{
HandleSecurity sec(g_pCoreIdent, g_pCoreIdent);
handlesys->FreeHandle(s_ForwardHndl, &sec);
s_ForwardHndl = BAD_HANDLE;
}
}

static cell_t sm_GetFunctionByName(IPluginContext *pContext, const cell_t *params)
Expand Down Expand Up @@ -363,6 +371,8 @@ static cell_t sm_CallStartForward(IPluginContext *pContext, const cell_t *params

s_CallStarted = true;

s_ForwardHndl = handlesys->FastCloneHandle(hndl);

return 1;
}

Expand Down Expand Up @@ -646,6 +656,8 @@ static cell_t sm_CallFinish(IPluginContext *pContext, const cell_t *params)

pContext->LocalToPhysAddr(params[1], &result);

AutoHandleRooter ahr(s_ForwardHndl);

// Note: Execute() swallows exceptions, so this is okay.
if (s_pFunction)
{
Expand Down