Skip to content

Fix dangling pointer when formatting keyName #53

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

Merged
x64-dev merged 1 commit into from
Oct 10, 2025
Merged

Fix dangling pointer when formatting keyName #53

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
4 changes: 3 additions & 1 deletion Generals/Code/GameEngine/Source/Common/RTS/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,9 @@ void Player::initFromDict(const Dict* d)
// Now do the TheKey_teamGenericScriptHookN (where N can be from 0 to 15.)
for (j = 0; j < MAX_GENERIC_SCRIPTS; ++j) {
AsciiString keyName;
keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook).str(), j);
// Store the result of keyToName in a local variable to avoid dangling pointer
AsciiString hookName = TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook);
keyName.format("%s%d", hookName.str(), j);
tmpStr = teamDict.getAsciiString(NAMEKEY(keyName), &exists);
if (exists && !tmpStr.isEmpty())
{
Expand Down
4 changes: 3 additions & 1 deletion Generals/Code/GameEngine/Source/Common/RTS/Team.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,9 @@ TeamTemplateInfo::TeamTemplateInfo(Dict *d) :
// Which scripts to attempt during run?
for (int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) {
AsciiString keyName;
keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook).str(), i);
// Store the result of keyToName in a local variable to avoid dangling pointer
AsciiString hookName = TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook);
keyName.format("%s%d", hookName.str(), i);
m_teamGenericScripts[i] = d->getAsciiString(NAMEKEY(keyName), &exists);
if (!exists) {
m_teamGenericScripts[i].clear();
Expand Down
4 changes: 3 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,9 @@ void Player::initFromDict(const Dict* d)
// Now do the TheKey_teamGenericScriptHookN (where N can be from 0 to 15.)
for (j = 0; j < MAX_GENERIC_SCRIPTS; ++j) {
AsciiString keyName;
keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook).str(), j);
// Store the result of keyToName in a local variable to avoid dangling pointer
AsciiString hookName = TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook);
keyName.format("%s%d", hookName.str(), j);
tmpStr = teamDict.getAsciiString(NAMEKEY(keyName), &exists);
if (exists && !tmpStr.isEmpty())
{
Expand Down
4 changes: 3 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,9 @@ TeamTemplateInfo::TeamTemplateInfo(Dict *d) :
// Which scripts to attempt during run?
for (int i = 0; i < MAX_GENERIC_SCRIPTS; ++i) {
AsciiString keyName;
keyName.format("%s%d", TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook).str(), i);
// Store the result of keyToName in a local variable to avoid dangling pointer
AsciiString hookName = TheNameKeyGenerator->keyToName(TheKey_teamGenericScriptHook);
keyName.format("%s%d", hookName.str(), i);
m_teamGenericScripts[i] = d->getAsciiString(NAMEKEY(keyName), &exists);
if (!exists) {
m_teamGenericScripts[i].clear();
Expand Down
Loading