Skip to content

Fix potential access violations with stale laser particle system IDs #397

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

Fix potential access violations with stale laser particle system IDs #397

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
10 changes: 10 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,11 @@ void LaserUpdate::initLaser( const Object *parent, const Coord3D *startPos, cons
{
system->setPosition( &m_startPos );
}
else
{
// Particle system no longer exists; clear the stale ID to prevent future access violations.
m_particleSystemID = INVALID_PARTICLE_SYSTEM_ID;
}
}
if( m_targetParticleSystemID )
{
Expand All @@ -299,6 +304,11 @@ void LaserUpdate::initLaser( const Object *parent, const Coord3D *startPos, cons
{
system->setPosition( &m_endPos );
}
else
{
// Particle system no longer exists; clear the stale ID to prevent future access violations.
m_targetParticleSystemID = INVALID_PARTICLE_SYSTEM_ID;
}
}

//Important! Set the laser position to the average of both points or else
Expand Down
10 changes: 10 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,11 @@ void LaserUpdate::initLaser( const Object *parent, const Object *target, const C
{
system->setPosition( &m_startPos );
}
else
{
// Particle system no longer exists; clear the stale ID to prevent future access violations.
m_particleSystemID = INVALID_PARTICLE_SYSTEM_ID;
}
}

//PLEASE NOTE You cannot check an ID for nullptr. This should be a check against INVALID_PARTICLE_SYSTEM_ID. Can't change it on the last day without a bug though.
Expand All @@ -402,6 +407,11 @@ void LaserUpdate::initLaser( const Object *parent, const Object *target, const C
{
system->setPosition( &m_endPos );
}
else
{
// Particle system no longer exists; clear the stale ID to prevent future access violations.
m_targetParticleSystemID = INVALID_PARTICLE_SYSTEM_ID;
}
}

//Important! Set the laser position to the average of both points or else
Expand Down
Loading