Skip to content

ScriptEngine: Check for NULL object pointer before returning from GetNamedObject #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ScriptEngine: Check for NULL object pointer before returning from GetNamedObject #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5284,7 +5284,13 @@ Object * ScriptEngine::getUnitNamed(const AsciiString& unitName)

for (VecNamedRequestsIt it = m_namedObjects.begin(); it != m_namedObjects.end(); ++it) {
if (unitName == (it->first)) {
return it->second;
// Check if the object pointer is valid before returning it
// Objects can be deleted but remain in cache with NULL pointer
if (it->second != NULL) {
return it->second;
}
// Object was deleted, return NULL
return NULL;
}
}
return NULL;
Expand Down
8 changes: 7 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6033,7 +6033,13 @@ Object* ScriptEngine::getUnitNamed(const AsciiString& unitName)

for (VecNamedRequestsIt it = m_namedObjects.begin(); it != m_namedObjects.end(); ++it) {
if (unitName == (it->first)) {
return it->second;
// Check if the object pointer is valid before returning it
// Objects can be deleted but remain in cache with NULL pointer
if (it->second != NULL) {
return it->second;
}
// Object was deleted, return NULL
return NULL;
}
}
return NULL;
Expand Down
Loading