Resolving code review feedback

Author: Skyaero42

Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp

@@ -1206,7 +1206,7 @@ RingPrototypeClass::RingPrototypeClass (void)
 RingPrototypeClass::RingPrototypeClass(RingRenderObjClass *ring)
 {
 	::memset (&Definition, 0, sizeof (Definition));
-	strlcpy (Definition.Name, ring->Get_Name(), ARRAY_SIZE(Definition.Name));
+	strlcpy(Definition.Name, ring->Get_Name(), ARRAY_SIZE(Definition.Name));
 
 	Definition.AnimDuration			= ring->AnimDuration;
 	Definition.Attributes			= ring->Get_Flags ();

Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp

@@ -437,8 +437,8 @@ const char * SphereRenderObjClass::Get_Name(void) const
 void SphereRenderObjClass::Set_Name(const char * name)
 {
 	WWASSERT(name != NULL);
-	WWASSERT(strlen(name) < 2*W3D_NAME_LEN);
-	strlcpy(Name, name, ARRAY_SIZE(Name));
+	const size_t nameLen = strlcpy(Name, name, ARRAY_SIZE(Name));
+	(void)nameLen; WWASSERT(nameLen < ARRAY_SIZE(Name));
 }
 
 

Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp

@@ -533,8 +533,8 @@ static void Get_W3D_Name (const char *filename, char *w3d_name)
 	// Copy all characters from start to end (excluding 'end')
 	// into the w3d_name buffer. Then capitalize the string.
 	int num_chars = end - start;
-	WWASSERT(num_chars <= W3D_NAME_LEN);
-	strlcpy(w3d_name, start, min(W3D_NAME_LEN, num_chars));
+	const size_t nameLen = strlcpy(w3d_name, start, min(W3D_NAME_LEN, num_chars));
+	(void)nameLen; WWASSERT(nameLen < min(W3D_NAME_LEN, num_chars));
 	strupr(w3d_name);
 }
 

Core/Libraries/Source/WWVegas/WWLib/registry.cpp

@@ -403,7 +403,7 @@ void RegistryClass::Save_Registry_Values(HKEY key, char *path, INIClass *ini)
 				** Handle binary values.
 				*/
 				case REG_BINARY:
-					strlcpy(save_name, "BIN_", ARRAY_SIZE(save_name));
+					strcpy(save_name, "BIN_");
 					strlcat(save_name, value_name, ARRAY_SIZE(save_name));
 					ini->Put_UUBlock(path, save_name, (char*)data, data_size);
 					break;

Core/Libraries/Source/WWVegas/WWLib/thread.cpp

@@ -34,8 +34,8 @@
 ThreadClass::ThreadClass(const char *thread_name, ExceptionHandlerType exception_handler) : handle(0), running(false), thread_priority(0)
 {
 	if (thread_name) {
-		assert(strlen(thread_name) < sizeof(ThreadName) - 1);
-		strlcpy(ThreadName, thread_name, ARRAY_SIZE(ThreadName));
+		size_t nameLen = strlcpy(ThreadName, thread_name, ARRAY_SIZE(ThreadName));
+		(void)nameLen; assert(nameLen < ARRAY_SIZE(ThreadName));
 	} else {
 		strcpy(ThreadName, "No name");;
 	}

GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp

@@ -349,7 +349,7 @@ void PerfGather::reset()
 {
 	PerfGather::termPerfDump();
 
-	strlcpy(s_buf, fname, ARRAY_SIZE(s_buf));
+	strlcpy(s_buf, fname, _MAX_PATH);
 
 	char tmp[256];
 	strlcpy(tmp, s_buf, ARRAY_SIZE(tmp));

GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp

@@ -847,14 +847,15 @@ static AsciiString getMapLeafAndDirName(const AsciiString& in)
 // ------------------------------------------------------------------------------------------------
 static AsciiString removeExtension(const AsciiString& in)
 {
-	char buf[1024];
-	strlcpy(buf, in.str(), ARRAY_SIZE(buf));
-	char* p = strrchr(buf, '.');
-	if (p)
+	if (const char* end = in.reverseFind('.'))
 	{
-		*p = 0;
+		const char* begin = in.str();
+		return AsciiString(begin, end - begin);
+	}
+	else
+	{
+		return in;
 	}
-	return AsciiString(buf);
 }
 
 // ------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp

@@ -219,11 +219,9 @@ void JoinDirectConnectGame()
 	AsciiString ipstring;
 	asciientry.nextToken(&ipstring, "(");
 
-	char ipstr[16];
-	strlcpy(ipstr, ipstring.str(), ARRAY_SIZE(ipstr));
-
 	Int ip1, ip2, ip3, ip4;
-	sscanf(ipstr, "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4);
+	Int numFields = sscanf(ipstring.str(), "%d.%d.%d.%d", &ip1, &ip2, &ip3, &ip4);
+	DEBUG_ASSERTCRASH(numFields == 4, ("JoinDirectConnectGame - invalid IP address format: %s", ipstring.str()));
 
 	DEBUG_LOG(("JoinDirectConnectGame - joining at %d.%d.%d.%d", ip1, ip2, ip3, ip4));
 

GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp

@@ -2627,11 +2627,10 @@ void ScriptActions::doDisplayCinematicText(const AsciiString& displayText, const
 
 	// get the font name
 	AsciiString fontName = AsciiString::TheEmptyString;
-	char buf[256];
-	char *c;
-	strlcpy(buf, fontType.str(), ARRAY_SIZE(buf));
+
 	// TheSuperHackers @fix xezon 16/03/2025 Fixes potential buffer overrun via prior c!='\0' test.
-	for( c = buf; *c != '\0'; c++ )
+	const char* c = fontType.str();
+	for (; *c != '\0'; c++)
 	{
 		if( *c != ' ' && *c++ != '-' )
 			fontName.concat(c);

GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp

@@ -2138,6 +2138,7 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 			char newName[256];
 			strlcpy(oldName, pParm->m_string.str(), ARRAY_SIZE(oldName));
 			strcpy(newName, "GLA");
+			static_assert(ARRAY_SIZE(oldName) >= ARRAY_SIZE("GLA"), "oldname buffer too small");
 			strlcat(newName, oldName+strlen("Fundamentalist"), ARRAY_SIZE(newName));
 			pParm->m_string.set(newName);
 			DEBUG_LOG(("Changing Script Ref from %s to %s", oldName, newName));