fix: Prevent crash if an INI data field is not found for debug builds

Stubbjax · Stubbjax · commit 8c3ec4c5d5a5 · 2025-08-26T12:31:29.000+10:00
diff --git a/Generals/Code/GameEngine/Source/Common/INI/INI.cpp b/Generals/Code/GameEngine/Source/Common/INI/INI.cpp
@@ -1528,7 +1528,10 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 				{
 					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'",
 														 INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) );
+#if !defined(RTS_DEBUG)
+					// Just ignore unknown fields in debug builds
 					throw INI_UNKNOWN_TOKEN;
+#endif
 				}
 
 			}  // end else
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp
@@ -1530,7 +1530,10 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList
 				{
 					DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'",
 														 INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) );
+#if !defined(RTS_DEBUG)
+					// Just ignore unknown fields in debug builds
 					throw INI_UNKNOWN_TOKEN;
+#endif
 				}
 
 			}  // end else

Original file line number	Diff line number	Diff line change
`@@ -1528,7 +1528,10 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList`
`1528`	`1528`	`{`
`1529`	`1529`	`DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'",`
`1530`	`1530`	`INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) );`
	`1531`	`+#if !defined(RTS_DEBUG)`
	`1532`	`+ // Just ignore unknown fields in debug builds`
`1531`	`1533`	`throw INI_UNKNOWN_TOKEN;`
	`1534`	`+#endif`
`1532`	`1535`	`}`
`1533`	`1536`
`1534`	`1537`	`} // end else`
Original file line number	Diff line number	Diff line change
`@@ -1530,7 +1530,10 @@ void INI::initFromINIMulti( void *what, const MultiIniFieldParse& parseTableList`
`1530`	`1530`	`{`
`1531`	`1531`	`DEBUG_ASSERTCRASH( 0, ("[LINE: %d - FILE: '%s'] Unknown field '%s' in block '%s'",`
`1532`	`1532`	`INI::getLineNum(), INI::getFilename().str(), field, m_curBlockStart) );`
	`1533`	`+#if !defined(RTS_DEBUG)`
	`1534`	`+ // Just ignore unknown fields in debug builds`
`1533`	`1535`	`throw INI_UNKNOWN_TOKEN;`
	`1536`	`+#endif`
`1534`	`1537`	`}`
`1535`	`1538`
`1536`	`1539`	`} // end else`