GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ScriptingObject::FromInterface to return object if the pointer is already valid object

Browse Source
This commit is contained in:
Wojtek Figat
2023-01-09 18:03:14 +01:00
parent 17f9219cd0
commit a74b847e65
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Source/Engine/Scripting/ScriptingObject.cpp
View File

@@ -108,21 +108,33 @@ ScriptingObject* ScriptingObject::FromInterface(void* interfaceObj, const Script
if (type.Type != ScriptingTypes::Script) if (type.Type != ScriptingTypes::Script)
continue; continue;
auto interfaceImpl = type.GetInterface(interfaceType); auto interfaceImpl = type.GetInterface(interfaceType);
if (interfaceImpl && interfaceImpl->IsNative) if (!interfaceImpl || !interfaceImpl->IsNative)
continue;
// Get vtable for this type
void* vtable = type.Script.VTable;
if (!vtable && type.GetDefaultInstance())
{ {
ScriptingObject* predictedObj = (ScriptingObject*)((byte*)interfaceObj - interfaceImpl->VTableOffset); // Use vtable from default instance of this type
void* predictedVTable = *(void***)predictedObj; vtable = *(void***)type.GetDefaultInstance();
void* vtable = type.Script.VTable; }
if (!vtable && type.GetDefaultInstance())
{ // Check if object interface vtable matches the type interface vtable value
// Use vtable from default instance of this type ScriptingObject* predictedObj = (ScriptingObject*)((byte*)interfaceObj - interfaceImpl->VTableOffset);
vtable = *(void***)type.GetDefaultInstance(); void* predictedVTable = *(void***)predictedObj;
} if (vtable == predictedVTable)
if (vtable == predictedVTable) {
{ ASSERT(predictedObj->GetType().GetInterface(interfaceType));
ASSERT(predictedObj->GetType().GetInterface(interfaceType)); return predictedObj;
return predictedObj; }
}
// Check for case of passing object directly
predictedObj = (ScriptingObject*)interfaceObj;
predictedVTable = *(void***)predictedObj;
if (vtable == predictedVTable)
{
ASSERT(predictedObj->GetType().GetInterface(interfaceType));
return predictedObj;
} }
} }
} }