Skip to content

[GEN][ZH] Workaround for checking 'this' pointer #865

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

Closed
Caball009 wants to merge 2 commits into from
Closed

[GEN][ZH] Workaround for checking 'this' pointer #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2505641
Explicitly check 'this' pointer (GEN).
Caball009 May 16, 2025
68151e0
Explicitly check 'this' pointer (ZH).
Caball009 May 16, 2025
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
3 changes: 2 additions & 1 deletion Generals/Code/GameEngine/Include/Common/GameMemory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,8 @@ class MemoryPoolObject

void deleteInstance()
{
if (this)
void * volatile checkThisPtr = this; // mitigate undefined behavior because this function is called on nullptrs
if (checkThisPtr)
{
MemoryPool *pool = this->getObjectMemoryPool(); // save this, since the dtor will nuke our vtbl
this->~MemoryPoolObject(); // it's virtual, so the right one will be called.
Expand Down
3 changes: 2 additions & 1 deletion GeneralsMD/Code/GameEngine/Include/Common/GameMemory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,8 @@ class MemoryPoolObject

void deleteInstance()
{
if (this)
void * volatile checkThisPtr = this; // mitigate undefined behavior because this function is called on nullptrs
if (checkThisPtr)
{
MemoryPool *pool = this->getObjectMemoryPool(); // save this, since the dtor will nuke our vtbl
this->~MemoryPoolObject(); // it's virtual, so the right one will be called.
Expand Down