Skip to content

fix: Fix incorrect argument used for isInSaveDirectory() #1849

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
merged 2 commits into from
Nov 13, 2025
Merged

fix: Fix incorrect argument used for isInSaveDirectory() #1849

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
2b17f11
fix: Fix incorrect argument used for isInSaveDirectory()
Skyaero42 Nov 13, 2025
808e30f
refactor: Moving string buffers to where they are first used.
Skyaero42 Nov 13, 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
7 changes: 3 additions & 4 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2146,19 +2146,17 @@ void GameLogic::loadMapINI( AsciiString mapName )
return;
}

char filename[_MAX_PATH];
char fullFledgeFilename[_MAX_PATH];

//
// if map name begins with a "SAVE_DIRECTORY\", then the map refers to a map
// that has been extracted from a save game file ... in that case we need to get
// the pristine map name string in order to manipulate and load the right map.ini
// for that map from it's original location
//
const char* pristineMapName = TheGameState->isInSaveDirectory(filename)
const char* pristineMapName = TheGameState->isInSaveDirectory(mapName.str())
? TheGameState->getSaveGameInfo()->pristineMapName.str()
: mapName.str();

char filename[_MAX_PATH];
strlcpy(filename, pristineMapName, ARRAY_SIZE(filename));

// sanity
Expand All @@ -2175,6 +2173,7 @@ void GameLogic::loadMapINI( AsciiString mapName )
*extension = 0;


char fullFledgeFilename[_MAX_PATH];
sprintf(fullFledgeFilename, "%s\\map.ini", filename);
if (TheFileSystem->doesFileExist(fullFledgeFilename)) {
DEBUG_LOG(("Loading map.ini"));
Expand Down
7 changes: 3 additions & 4 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2463,19 +2463,17 @@ void GameLogic::loadMapINI( AsciiString mapName )
return;
}

char filename[_MAX_PATH];
char fullFledgeFilename[_MAX_PATH];

//
// if map name begins with a "SAVE_DIRECTORY\", then the map refers to a map
// that has been extracted from a save game file ... in that case we need to get
// the pristine map name string in order to manipulate and load the right map.ini
// for that map from it's original location
//
const char* pristineMapName = TheGameState->isInSaveDirectory(filename)
const char* pristineMapName = TheGameState->isInSaveDirectory(mapName.str())
? TheGameState->getSaveGameInfo()->pristineMapName.str()
: mapName.str();

char filename[_MAX_PATH];
strlcpy(filename, pristineMapName, ARRAY_SIZE(filename));

// sanity
Expand All @@ -2492,6 +2490,7 @@ void GameLogic::loadMapINI( AsciiString mapName )
*extension = 0;


char fullFledgeFilename[_MAX_PATH];
sprintf(fullFledgeFilename, "%s\\map.ini", filename);
if (TheFileSystem->doesFileExist(fullFledgeFilename)) {
DEBUG_LOG(("Loading map.ini"));
Expand Down
Loading