Merge pull request #470 from GeneralsOnlineDevelopmentTeam/seer/fix/mapcache-null-backslash

x64-dev · web-flow · commit 56c8dc402034 · 2026-05-07T17:43:48.000-04:00
bugfix(mapcache): Fix potential null dereference when parsing map names
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp b/Generals/Code/GameEngine/Source/Common/INI/INIMapCache.cpp
@@ -149,7 +149,8 @@ void INI::parseMapCacheDefinition( INI* ini )
 	{
 		// maps without localized name tags
 		AsciiString tempdisplayname;
-		tempdisplayname = name.reverseFind('\\') + 1;
+		const char *lastBackslash = name.reverseFind('\\');
+		tempdisplayname = lastBackslash ? lastBackslash + 1 : name.str();
 		md.m_displayName.translate(tempdisplayname);
 		if (md.m_numPlayers >= 2)
 		{
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INIMapCache.cpp
@@ -149,7 +149,8 @@ void INI::parseMapCacheDefinition( INI* ini )
 	{
 		// maps without localized name tags
 		AsciiString tempdisplayname;
-		tempdisplayname = name.reverseFind('\\') + 1;
+		const char *lastBackslash = name.reverseFind('\\');
+		tempdisplayname = lastBackslash ? lastBackslash + 1 : name.str();
 		md.m_displayName.translate(tempdisplayname);
 		if (md.m_numPlayers >= 2)
 		{

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,8 @@ void INI::parseMapCacheDefinition( INI* ini )`
`149`	`149`	`{`
`150`	`150`	`// maps without localized name tags`
`151`	`151`	`AsciiString tempdisplayname;`
`152`		`- tempdisplayname = name.reverseFind('\\') + 1;`
	`152`	`+ const char *lastBackslash = name.reverseFind('\\');`
	`153`	`+ tempdisplayname = lastBackslash ? lastBackslash + 1 : name.str();`
`153`	`154`	`md.m_displayName.translate(tempdisplayname);`
`154`	`155`	`if (md.m_numPlayers >= 2)`
`155`	`156`	`{`