MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-07-27 07:31:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check type of Squirrel constructor_stub() instance

Browse Source 
This prevents manual invocations of the native class constructor with an
invalid value.
This commit is contained in:
Alexander 'z33ky' Hirsch 2025-06-23 20:55:13 +02:00
parent 9c494b6eeb
commit 9c740a891e
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sp/src/vscript/vscript_squirrel.cpp
View File

@ -1562,15 +1562,23 @@ SQInteger constructor_stub(HSQUIRRELVM vm)
Assert(pSquirrelVM); Assert(pSquirrelVM);
sq_resetobject(&pSquirrelVM->lastError_); sq_resetobject(&pSquirrelVM->lastError_);
void* instance = pClassDesc->m_pfnConstruct();
// expect construction to always succeed
Assert(sq_isnull(pSquirrelVM->lastError_));
{ {
SQUserPointer p; SQUserPointer p;
sq_getinstanceup(vm, 1, &p, 0); if (SQ_FAILED(sq_getinstanceup(vm, 1, &p, 0)))
{
return SQ_ERROR;
}
if (!p)
{
return sq_throwerror(vm, "Accessed null instance");
}
void* instance = pClassDesc->m_pfnConstruct();
// expect construction to always succeed
Assert(sq_isnull(pSquirrelVM->lastError_));
new(p) ClassInstanceData(instance, pClassDesc, nullptr, true); new(p) ClassInstanceData(instance, pClassDesc, nullptr, true);
} }