Skip to content

RankPoints: Add safety checks for potentially corrupted TheGameSpyConfig pointer #69

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

Draft
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −14
Draft

RankPoints: Add safety checks for potentially corrupted TheGameSpyConfig pointer #69

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: 8 additions & 0 deletions Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,12 @@ class GameSpyConfigInterface

extern GameSpyConfigInterface *TheGameSpyConfig;

// Helper function to safely check if TheGameSpyConfig pointer is valid
// Protects against both NULL and corrupted pointer values (e.g., small integers like 0x4)
inline bool IsGameSpyConfigValid()
{
// A valid pointer on Windows should be >= 0x10000 (64KB) to avoid accessing low memory
return (TheGameSpyConfig != NULL) && ((uintptr_t)TheGameSpyConfig >= 0x10000);
}

#endif // __GSCONFIG_H__
42 changes: 28 additions & 14 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,22 +246,36 @@ void GetAdditionalDisconnectsFromUserFile(PSPlayerStats *stats)
RankPoints::RankPoints(void)
{
m_ranks[RANK_PRIVATE] = 0;
// Use default values if TheGameSpyConfig is NULL (can happen if called during teardown)
if (TheGameSpyConfig != NULL)
{
m_ranks[RANK_CORPORAL] = TheGameSpyConfig->getPointsForRank(RANK_CORPORAL); // 5
m_ranks[RANK_SERGEANT] = TheGameSpyConfig->getPointsForRank(RANK_SERGEANT); // 10
m_ranks[RANK_LIEUTENANT] = TheGameSpyConfig->getPointsForRank(RANK_LIEUTENANT); // 20
m_ranks[RANK_CAPTAIN] = TheGameSpyConfig->getPointsForRank(RANK_CAPTAIN); // 50
m_ranks[RANK_MAJOR] = TheGameSpyConfig->getPointsForRank(RANK_MAJOR); // 100
m_ranks[RANK_COLONEL] = TheGameSpyConfig->getPointsForRank(RANK_COLONEL); // 200
m_ranks[RANK_BRIGADIER_GENERAL] = TheGameSpyConfig->getPointsForRank(RANK_BRIGADIER_GENERAL); // 500
m_ranks[RANK_GENERAL] = TheGameSpyConfig->getPointsForRank(RANK_GENERAL); // 1000
m_ranks[RANK_COMMANDER_IN_CHIEF] = TheGameSpyConfig->getPointsForRank(RANK_COMMANDER_IN_CHIEF); // 2000

// Validate TheGameSpyConfig pointer before use using helper function
Bool isValidPointer = IsGameSpyConfigValid();

if (isValidPointer)
{
// Additional safety: wrap in try-catch to handle any remaining access violations
try
{
m_ranks[RANK_CORPORAL] = TheGameSpyConfig->getPointsForRank(RANK_CORPORAL); // 5
m_ranks[RANK_SERGEANT] = TheGameSpyConfig->getPointsForRank(RANK_SERGEANT); // 10
m_ranks[RANK_LIEUTENANT] = TheGameSpyConfig->getPointsForRank(RANK_LIEUTENANT); // 20
m_ranks[RANK_CAPTAIN] = TheGameSpyConfig->getPointsForRank(RANK_CAPTAIN); // 50
m_ranks[RANK_MAJOR] = TheGameSpyConfig->getPointsForRank(RANK_MAJOR); // 100
m_ranks[RANK_COLONEL] = TheGameSpyConfig->getPointsForRank(RANK_COLONEL); // 200
m_ranks[RANK_BRIGADIER_GENERAL] = TheGameSpyConfig->getPointsForRank(RANK_BRIGADIER_GENERAL); // 500
m_ranks[RANK_GENERAL] = TheGameSpyConfig->getPointsForRank(RANK_GENERAL); // 1000
m_ranks[RANK_COMMANDER_IN_CHIEF] = TheGameSpyConfig->getPointsForRank(RANK_COMMANDER_IN_CHIEF); // 2000
}
catch (...)
{
// If any exception occurs (e.g., access violation), fall back to default values
DEBUG_LOG(("RankPoints::RankPoints() - Exception accessing TheGameSpyConfig (possibly corrupted pointer), using defaults"));
isValidPointer = false;
}
}
else

if (!isValidPointer)
{
// Use default hardcoded values when TheGameSpyConfig is not available
// Use default hardcoded values when TheGameSpyConfig is not available or corrupted
m_ranks[RANK_CORPORAL] = 5;
m_ranks[RANK_SERGEANT] = 10;
m_ranks[RANK_LIEUTENANT] = 20;
Expand Down
8 changes: 8 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,12 @@ class GameSpyConfigInterface

extern GameSpyConfigInterface *TheGameSpyConfig;

// Helper function to safely check if TheGameSpyConfig pointer is valid
// Protects against both NULL and corrupted pointer values (e.g., small integers like 0x4)
inline bool IsGameSpyConfigValid()
{
// A valid pointer on Windows should be >= 0x10000 (64KB) to avoid accessing low memory
return (TheGameSpyConfig != NULL) && ((uintptr_t)TheGameSpyConfig >= 0x10000);
}

#endif // __GSCONFIG_H__
Loading