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

DHooks: Fix changing of byref vector parameters (#1772)

Browse Source 
We always created a new vector object instead of changing the passed in vector directly. This works for the function being called using our changed values - but the caller doesn't see the changed values if it's passing a vector by reference.

Only create a new vector if there isn't one being passed in and set the values directly in the passed in vector otherwise.
This commit is contained in:
peace-maker 2022-05-31 14:55:47 +02:00 committed by Nick Hastings
parent 0dcfdf3d7e
commit 54fd778830
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extensions/dhooks/natives.cpp
View File

@ -884,7 +884,8 @@ cell_t Native_SetParamVector(IPluginContext *pContext, const cell_t *params)
int index = params[2] - 1; int index = params[2] - 1;
size_t offset = GetParamOffset(paramStruct, index); size_t offset = GetParamOffset(paramStruct, index);
void *addr = (void **)((intptr_t)paramStruct->newParams + offset); void **origAddr = (void **)((intptr_t)paramStruct->orgParams + offset);
void **newAddr = (void **)((intptr_t)paramStruct->newParams + offset);
switch(paramStruct->dg->params.at(index).type) switch(paramStruct->dg->params.at(index).type)
{ {
@ -892,11 +893,23 @@ cell_t Native_SetParamVector(IPluginContext *pContext, const cell_t *params)
{ {
cell_t *buffer; cell_t *buffer;
pContext->LocalToPhysAddr(params[3], &buffer); pContext->LocalToPhysAddr(params[3], &buffer);
SDKVector *origVec = *(SDKVector **)origAddr;
SDKVector **newVec = (SDKVector **)newAddr;
*(SDKVector **)addr = new SDKVector(sp_ctof(buffer[0]), sp_ctof(buffer[1]), sp_ctof(buffer[2])); if(origVec == nullptr)
{
*newVec = new SDKVector(sp_ctof(buffer[0]), sp_ctof(buffer[1]), sp_ctof(buffer[2]));
// Free it later (cheaply) after the function returned.
smutils->AddFrameAction(FreeChangedVector, *newVec);
}
else
{
origVec->x = sp_ctof(buffer[0]);
origVec->y = sp_ctof(buffer[1]);
origVec->z = sp_ctof(buffer[2]);
*newVec = origVec;
}
paramStruct->isChanged[index] = true; paramStruct->isChanged[index] = true;
// Free it later (cheaply) after the function returned.
smutils->AddFrameAction(FreeChangedVector, *(SDKVector **)addr);
return 1; return 1;
} }
} }