Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix IsEntity() and SimpleEntity() improperly returning true when the listener is NULL
Some checks failed
CodeQL / Analyze (push) Waiting to run
Details
Build branch / build-all (push) Failing after 15s
Details

Browse source
This commit is contained in:
smallmodel 2025-01-18 15:43:20 +01:00 • committed by GitHub
parent 1a71d44b43
commit 7ab04b0bcb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

43
code/script/scriptvariable.cpp
View file

@ -604,17 +604,22 @@ variabletype ScriptVariable::GetType() const
qboolean ScriptVariable::IsEntity(void)
{
if (type == VARIABLE_LISTENER) {
if (!m_data.listenerValue->Pointer()
#if defined(GAME_DLL)
|| checkInheritance(Entity::classinfostatic(), m_data.listenerValue->Pointer()->classinfo())
#endif
) {
return true;
}
if (type != VARIABLE_LISTENER) {
return false;
}
return false;
if (!m_data.listenerValue->Pointer()) {
// Fixed in OPM
// Not sure why OG returns true
return false;
}
#if defined(GAME_DLL)
if (!checkInheritance(Entity::classinfostatic(), m_data.listenerValue->Pointer()->classinfo())) {
return false;
}
#endif
return true;
}
qboolean ScriptVariable::IsListener(void)
@ -636,14 +641,22 @@ qboolean ScriptVariable::IsConstArray() const
qboolean ScriptVariable::IsSimpleEntity(void)
{
if (type == VARIABLE_LISTENER) {
if (!m_data.listenerValue->Pointer()
|| checkInheritance(&SimpleEntity::ClassInfo, m_data.listenerValue->Pointer()->classinfo())) {
return true;
}
if (type != VARIABLE_LISTENER) {
return false;
}
return false;
if (!m_data.listenerValue->Pointer()) {
// Fixed in OPM
// Not sure why OG returns true
return false;
}
#if defined(GAME_DLL)
if (!checkInheritance(Entity::classinfostatic(), m_data.listenerValue->Pointer()->classinfo())) {
return false;
}
#endif
return true;
}
#endif