UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed amb581 - reentrancy problems with Call_Finish()

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401088
This commit is contained in:
Scott Ehlert 2007-07-09 06:03:04 +00:00
parent 6140c3b736
commit 984df35414
2 changed files with 70 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/smn_functions.cpp
View File

@ -75,6 +75,7 @@ inline void ResetCall()
{ {
s_CallStarted = false; s_CallStarted = false;
s_pFunction = NULL; s_pFunction = NULL;
s_pForward = NULL;
s_pCallable = NULL; s_pCallable = NULL;
} }
@ -542,14 +543,14 @@ static cell_t sm_CallFinish(IPluginContext *pContext, const cell_t *params)
if (s_pFunction) if (s_pFunction)
{ {
IPluginFunction *pFunction = s_pFunction; IPluginFunction *pFunction = s_pFunction;
ResetCall();
err = pFunction->Execute(result); err = pFunction->Execute(result);
} else if (s_pForward) { } else if (s_pForward) {
IForward *pForward = s_pForward; IForward *pForward = s_pForward;
ResetCall();
err = pForward->Execute(result, NULL); err = pForward->Execute(result, NULL);
} }
ResetCall();
return err; return err;
} }

69
plugins/testsuite/callfunctest.sp
View File

@ -12,6 +12,7 @@ public Plugin:myinfo =
public OnPluginStart() public OnPluginStart()
{ {
RegServerCmd("test_callfunc", Command_CallFunc); RegServerCmd("test_callfunc", Command_CallFunc);
RegServerCmd("test_callfunc_reentrant", Command_ReentrantCallFunc);
} }
public OnCallFuncReceived(num, Float:fnum, String:str[], String:str2[], &val, &Float:fval, array[], array2[], size, hello2[1]) public OnCallFuncReceived(num, Float:fnum, String:str[], String:str2[], &val, &Float:fval, array[], array2[], size, hello2[1])
@ -40,9 +41,9 @@ public OnCallFuncReceived(num, Float:fnum, String:str[], String:str2[], &val, &F
} }
/* This shouldn't get copied back */ /* This shouldn't get copied back */
StrCopy(str, strlen(str) + 1, "Yeti"); strcopy(str, strlen(str) + 1, "Yeti");
/* This should get copied back */ /* This should get copied back */
StrCopy(str2, strlen(str2) + 1, "Gaben is fat."); strcopy(str2, strlen(str2) + 1, "Gaben is fat.");
/* This should get copied back */ /* This should get copied back */
array[0] = 5; array[0] = 5;
@ -53,6 +54,45 @@ public OnCallFuncReceived(num, Float:fnum, String:str[], String:str2[], &val, &F
return 42; return 42;
} }
public OnReentrantCallReceived(num, String:str[])
{
new err, ret;
PrintToServer("Inside OnReentrantCallReceived...");
PrintToServer("num = %d (expected: %d)", num, 7);
PrintToServer("str[] = \"%s\" (expected: \"%s\")", str, "nana");
new Function:func = GetFunctionByName(INVALID_HANDLE, "OnReentrantCallReceivedTwo");
if (func == INVALID_FUNCTION)
{
PrintToServer("Failed to get the function id of OnReentrantCallReceivedTwo");
return 0;
}
PrintToServer("Calling OnReentrantCallReceivedTwo...");
Call_StartFunction(INVALID_HANDLE, func);
Call_PushFloat(8.0);
err = Call_Finish(ret);
PrintToServer("Call to OnReentrantCallReceivedTwo has finished!");
PrintToServer("Error code = %d (expected: %d)", err, 0);
PrintToServer("Return value = %d (expected: %d)", ret, 707);
return 11;
}
public OnReentrantCallReceivedTwo(Float:fnum)
{
PrintToServer("Inside OnReentrantCallReceivedTwo...");
PrintToServer("fnum = %f (expected: %f)", fnum, 8.0);
return 707;
}
public Action:Command_CallFunc(args) public Action:Command_CallFunc(args)
{ {
new a = 62; new a = 62;
@ -102,3 +142,28 @@ public Action:Command_CallFunc(args)
return Plugin_Handled; return Plugin_Handled;
} }
public Action:Command_ReentrantCallFunc(args)
{
new err, ret;
new Function:func = GetFunctionByName(INVALID_HANDLE, "OnReentrantCallReceived");
if (func == INVALID_FUNCTION)
{
PrintToServer("Failed to get the function id of OnReentrantCallReceived");
return Plugin_Handled;
}
PrintToServer("Calling OnReentrantCallReceived...");
Call_StartFunction(INVALID_HANDLE, func);
Call_PushCell(7);
Call_PushString("nana");
err = Call_Finish(ret);
PrintToServer("Call to OnReentrantCallReceived has finished!");
PrintToServer("Error code = %d (expected: %d)", err, 0);
PrintToServer("Return value = %d (expected: %d)", ret, 11);
return Plugin_Handled;
}