[GEN][ZH] Fix static initialization order for StatDumpClass and LogClass (#1003)

Caball009 · web-flow · commit 68d4db323207 · 2025-06-13T11:27:38.000+02:00
diff --git a/Generals/Code/GameEngine/Source/Common/Dict.cpp b/Generals/Code/GameEngine/Source/Common/Dict.cpp
@@ -160,6 +160,7 @@ Dict::DictPair *Dict::ensureUnique(int numPairsNeeded, Bool preserveData, DictPa
 	Dict::DictPairData* newData = NULL;
 	if (numPairsNeeded > 0)
 	{
+		DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order.\n"));
 		DEBUG_ASSERTCRASH(numPairsNeeded <= MAX_LEN, ("Dict::ensureUnique exceeds max pairs length %d with requested length %d", MAX_LEN, numPairsNeeded));
 		int minBytes = sizeof(Dict::DictPairData) + numPairsNeeded*sizeof(Dict::DictPair);
 		int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
diff --git a/Generals/Code/GameEngine/Source/Common/MiniLog.cpp b/Generals/Code/GameEngine/Source/Common/MiniLog.cpp
@@ -46,9 +46,9 @@ LogClass::LogClass(const char *fname)
 		}
 		pEnd--;
 	}
-	AsciiString fullPath;
-	fullPath.format("%s\\%s", buffer, fname);
-	m_fp = fopen(fullPath.str(), "wt");
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 LogClass::~LogClass()
diff --git a/Generals/Code/GameEngine/Source/Common/System/AsciiString.cpp b/Generals/Code/GameEngine/Source/Common/System/AsciiString.cpp
@@ -138,6 +138,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData
 		return;
 	}
 
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order.\n"));
 	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("AsciiString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
 	int minBytes = sizeof(AsciiStringData) + numCharsNeeded*sizeof(char);
 	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
diff --git a/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp b/Generals/Code/GameEngine/Source/Common/System/UnicodeString.cpp
@@ -94,6 +94,7 @@ void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveDa
 		return;
 	}
 
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order.\n"));
 	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("UnicodeString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
 	int minBytes = sizeof(UnicodeStringData) + numCharsNeeded*sizeof(WideChar);
 	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
@@ -114,9 +114,9 @@ LogClass::LogClass(const char *fname)
 		}
 		pEnd--;
 	}
-	AsciiString fullPath;
-	fullPath.format("%s\\%s", buffer, fname);
-	m_fp = fopen(fullPath.str(), "wt");
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 LogClass::~LogClass()
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
@@ -162,9 +162,9 @@ StatDumpClass::StatDumpClass( const char *fname )
 		}
 		pEnd--;
 	}
-	AsciiString fullPath;
-	fullPath.format( "%s\\%s", buffer, fname );
-	m_fp = fopen( fullPath.str(), "wt" );
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 //=============================================================================
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Dict.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Dict.cpp
@@ -160,6 +160,7 @@ Dict::DictPair *Dict::ensureUnique(int numPairsNeeded, Bool preserveData, DictPa
 	Dict::DictPairData* newData = NULL;
 	if (numPairsNeeded > 0)
 	{
+		DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order.\n"));
 		DEBUG_ASSERTCRASH(numPairsNeeded <= MAX_LEN, ("Dict::ensureUnique exceeds max pairs length %d with requested length %d", MAX_LEN, numPairsNeeded));
 		int minBytes = sizeof(Dict::DictPairData) + numPairsNeeded*sizeof(Dict::DictPair);
 		int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MiniLog.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MiniLog.cpp
@@ -46,9 +46,9 @@ LogClass::LogClass(const char *fname)
 		}
 		pEnd--;
 	}
-	AsciiString fullPath;
-	fullPath.format("%s\\%s", buffer, fname);
-	m_fp = fopen(fullPath.str(), "wt");
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 LogClass::~LogClass()
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/AsciiString.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/AsciiString.cpp
@@ -138,6 +138,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData
 		return;
 	}
 
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order.\n"));
 	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("AsciiString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
 	int minBytes = sizeof(AsciiStringData) + numCharsNeeded*sizeof(char);
 	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/UnicodeString.cpp
@@ -94,6 +94,7 @@ void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveDa
 		return;
 	}
 
+	DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order.\n"));
 	DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("UnicodeString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));
 	int minBytes = sizeof(UnicodeStringData) + numCharsNeeded*sizeof(WideChar);
 	int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
@@ -114,9 +114,9 @@ LogClass::LogClass(const char *fname)
 		}
 		pEnd--;
 	}
-	AsciiString fullPath;
-	fullPath.format("%s\\%s", buffer, fname);
-	m_fp = fopen(fullPath.str(), "wt");
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 LogClass::~LogClass()
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
@@ -163,9 +163,9 @@ StatDumpClass::StatDumpClass( const char *fname )
 		}
 		pEnd--;
 	}
-	AsciiString fullPath;
-	fullPath.format( "%s\\%s", buffer, fname );
-	m_fp = fopen( fullPath.str(), "wt" );
+	// TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.
+	const std::string fullPath = std::string(buffer) + "\\" + fname;
+	m_fp = fopen(fullPath.c_str(), "wt");
 }
 
 //=============================================================================

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ Dict::DictPair *Dict::ensureUnique(int numPairsNeeded, Bool preserveData, DictPa`
`160`	`160`	`Dict::DictPairData* newData = NULL;`
`161`	`161`	`if (numPairsNeeded > 0)`
`162`	`162`	`{`
	`163`	`+ DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order.\n"));`
`163`	`164`	`DEBUG_ASSERTCRASH(numPairsNeeded <= MAX_LEN, ("Dict::ensureUnique exceeds max pairs length %d with requested length %d", MAX_LEN, numPairsNeeded));`
`164`	`165`	`int minBytes = sizeof(Dict::DictPairData) + numPairsNeeded*sizeof(Dict::DictPair);`
`165`	`166`	`int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ LogClass::LogClass(const char *fname)`
`46`	`46`	`}`
`47`	`47`	`pEnd--;`
`48`	`48`	`}`
`49`		`- AsciiString fullPath;`
`50`		`- fullPath.format("%s\\%s", buffer, fname);`
`51`		`- m_fp = fopen(fullPath.str(), "wt");`
	`49`	`+ // TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.`
	`50`	`+ const std::string fullPath = std::string(buffer) + "\\" + fname;`
	`51`	`+ m_fp = fopen(fullPath.c_str(), "wt");`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`LogClass::~LogClass()`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData`
`138`	`138`	`return;`
`139`	`139`	`}`
`140`	`140`
	`141`	`+ DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order.\n"));`
`141`	`142`	`DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("AsciiString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));`
`142`	`143`	`int minBytes = sizeof(AsciiStringData) + numCharsNeeded*sizeof(char);`
`143`	`144`	`int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveDa`
`94`	`94`	`return;`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ DEBUG_ASSERTCRASH(TheDynamicMemoryAllocator != NULL, ("Cannot use dynamic memory allocator before its initialization. Check static initialization order.\n"));`
`97`	`98`	`DEBUG_ASSERTCRASH(numCharsNeeded <= MAX_LEN, ("UnicodeString::ensureUniqueBufferOfSize exceeds max string length %d with requested length %d", MAX_LEN, numCharsNeeded));`
`98`	`99`	`int minBytes = sizeof(UnicodeStringData) + numCharsNeeded*sizeof(WideChar);`
`99`	`100`	`int actualBytes = TheDynamicMemoryAllocator->getActualAllocationSize(minBytes);`
Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,9 @@ LogClass::LogClass(const char *fname)`
`114`	`114`	`}`
`115`	`115`	`pEnd--;`
`116`	`116`	`}`
`117`		`- AsciiString fullPath;`
`118`		`- fullPath.format("%s\\%s", buffer, fname);`
`119`		`- m_fp = fopen(fullPath.str(), "wt");`
	`117`	`+ // TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.`
	`118`	`+ const std::string fullPath = std::string(buffer) + "\\" + fname;`
	`119`	`+ m_fp = fopen(fullPath.c_str(), "wt");`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`LogClass::~LogClass()`
Original file line number	Diff line number	Diff line change
`@@ -162,9 +162,9 @@ StatDumpClass::StatDumpClass( const char *fname )`
`162`	`162`	`}`
`163`	`163`	`pEnd--;`
`164`	`164`	`}`
`165`		`- AsciiString fullPath;`
`166`		`- fullPath.format( "%s\\%s", buffer, fname );`
`167`		`- m_fp = fopen( fullPath.str(), "wt" );`
	`165`	`+ // TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.`
	`166`	`+ const std::string fullPath = std::string(buffer) + "\\" + fname;`
	`167`	`+ m_fp = fopen(fullPath.c_str(), "wt");`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`//=============================================================================`
Original file line number	Diff line number	Diff line change
`@@ -163,9 +163,9 @@ StatDumpClass::StatDumpClass( const char *fname )`
`163`	`163`	`}`
`164`	`164`	`pEnd--;`
`165`	`165`	`}`
`166`		`- AsciiString fullPath;`
`167`		`- fullPath.format( "%s\\%s", buffer, fname );`
`168`		`- m_fp = fopen( fullPath.str(), "wt" );`
	`166`	`+ // TheSuperHackers @fix Caball009 03/06/2025 Don't use AsciiString here anymore because its memory allocator may not have been initialized yet.`
	`167`	`+ const std::string fullPath = std::string(buffer) + "\\" + fname;`
	`168`	`+ m_fp = fopen(fullPath.c_str(), "wt");`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`//=============================================================================`