fix(zh): Replace strcat with strlcat

Bart Roossien · Bart Roossien · commit c7d5ebd113ea · 2025-10-10T23:04:27.000+02:00
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp b/GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp
@@ -782,8 +782,8 @@ AsciiString INI::getNextQuotedAsciiString()
 
 				if (strlen(token) > 1 && token[1] != '\t')
 				{
-					strcat(buff, " ");
-					strcat(buff, token);
+					strlcat(buff, " ", INI_MAX_CHARS_PER_LINE);
+					strlcat(buff, token, INI_MAX_CHARS_PER_LINE);
 				}
 				else
 				{	Int buflen=strlen(buff);
@@ -824,9 +824,9 @@ AsciiString INI::getNextAsciiString()
 			if (token) {
 				if (strlen(token) > 1 && token[1] != '\t')
 				{
-					strcat(buff, " ");
+					strlcat(buff, " ", INI_MAX_CHARS_PER_LINE);
 				}
-				strcat(buff, token);
+				strlcat(buff, token, INI_MAX_CHARS_PER_LINE);
 				result.set(buff);
 			} else {
 				Int len = strlen(buff);
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp b/GeneralsMD/Code/GameEngine/Source/Common/PerfTimer.cpp
@@ -353,7 +353,7 @@ void PerfGather::reset()
 
 	char tmp[256];
 	strcpy(tmp, s_buf);
-	strcat(tmp, ".csv");
+	strlcat(tmp, ".csv", ARRAY_SIZE(tmp));
 
 	s_perfStatsFile = fopen(tmp, "w");
 	s_perfDumpOptions = options;
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp
@@ -617,7 +617,7 @@ void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 		else
 		{
 			sprintf (bytestr, "%02X ", *eip_ptr);
-			strcat (scrap, bytestr);
+			strlcat(scrap, bytestr, ARRAY_SIZE(scrap));
 		}
 		eip_ptr++;
 	}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp
@@ -2138,7 +2138,7 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)
 			char newName[256];
 			strcpy(oldName, pParm->m_string.str());
 			strcpy(newName, "GLA");
-			strcat(newName, oldName+strlen("Fundamentalist"));
+			strlcat(newName, oldName+strlen("Fundamentalist"), ARRAY_SIZE(newName));
 			pParm->m_string.set(newName);
 			DEBUG_LOG(("Changing Script Ref from %s to %s", oldName, newName));
 		}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DBridgeBuffer.cpp
@@ -237,11 +237,11 @@ Bool W3DBridge::load(BodyDamageType curDamageState)
 	char right[_MAX_PATH];
 
 	strcpy(left, modelName);
-	strcat(left, ".BRIDGE_LEFT");
+	strlcat(left, ".BRIDGE_LEFT", _MAX_PATH);
 	strcpy(section, modelName);
-	strcat(section, ".BRIDGE_SPAN");
+	strlcat(section, ".BRIDGE_SPAN", _MAX_PATH);
 	strcpy(right, modelName);
-	strcat(right, ".BRIDGE_RIGHT");
+	strlcat(right, ".BRIDGE_RIGHT", _MAX_PATH);
 
 	m_bridgeTexture = pMgr->Get_Texture(textureFile,  MIP_LEVELS_3);
 	m_leftMtx.Make_Identity();
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
@@ -3021,7 +3021,7 @@ void W3DDisplay::takeScreenShot(void)
 		sprintf( leafname, "%s%.3d.bmp", "sshot", frame_number++);
 #endif
 		strcpy(pathname, TheGlobalData->getPath_UserData().str());
-		strcat(pathname, leafname);
+		strlcat(pathname, leafname, ARRAY_SIZE(pathname));
 		if (_access( pathname, 0 ) == -1)
 			done = true;
 	}
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DFileSystem.cpp
@@ -189,7 +189,7 @@ char const * GameFileClass::Set_Name( char const *filename )
 	{
 		static const char *localizedPathFormat = "Data/%s/Art/W3D/";
 		sprintf(m_filePath,localizedPathFormat, GetRegistryLanguage().str());
-		strcat( m_filePath, filename );
+		strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 	}
 
@@ -198,7 +198,7 @@ char const * GameFileClass::Set_Name( char const *filename )
 	{
 		static const char *localizedPathFormat = "Data/%s/Art/Textures/";
 		sprintf(m_filePath,localizedPathFormat, GetRegistryLanguage().str());
-		strcat( m_filePath, filename );
+		strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 	}
 
@@ -215,14 +215,14 @@ char const * GameFileClass::Set_Name( char const *filename )
 		{
 
 			strcpy( m_filePath, W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 		}
 		else if( isImageFileType(fileType) )
 		{
 
 			strcpy( m_filePath, TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 		}
 		else
@@ -243,14 +243,14 @@ char const * GameFileClass::Set_Name( char const *filename )
 		{
 
 			strcpy( m_filePath, LEGACY_W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 		}
 		else if( isImageFileType(fileType) )
 		{
 
 			strcpy( m_filePath, LEGACY_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 		}
 
@@ -271,14 +271,14 @@ char const * GameFileClass::Set_Name( char const *filename )
 		{
 
 			strcpy( m_filePath, TEST_W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 		}
 		else if( isImageFileType(fileType) )
 		{
 
 			strcpy( m_filePath, TEST_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 		}
 
@@ -295,14 +295,14 @@ char const * GameFileClass::Set_Name( char const *filename )
 		{
 			sprintf(m_filePath,USER_W3D_DIR_PATH, TheGlobalData->getPath_UserData().str());
 			//strcpy( m_filePath, USER_W3D_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 		}
 		if( isImageFileType(fileType) )
 		{
 			sprintf(m_filePath,USER_TGA_DIR_PATH, TheGlobalData->getPath_UserData().str());
 			//strcpy( m_filePath, USER_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 		}
 
@@ -319,7 +319,7 @@ char const * GameFileClass::Set_Name( char const *filename )
 		{
 			sprintf(m_filePath,MAP_PREVIEW_DIR_PATH, TheGlobalData->getPath_UserData().str());
 			//strcpy( m_filePath, USER_TGA_DIR_PATH );
-			strcat( m_filePath, filename );
+			strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));
 
 		}
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp
@@ -552,8 +552,8 @@ int HMorphAnimClass::Load_W3D(ChunkLoadClass & cload)
 	strncpy(AnimName,header.Name,sizeof(AnimName));
    strncpy(HierarchyName,header.HierarchyName,sizeof(HierarchyName));
 	strcpy(Name,HierarchyName);
-	strcat(Name,".");
-	strcat(Name,AnimName);
+	strlcat(Name, ".", ARRAY_SIZE(Name));
+	strlcat(Name, AnimName, ARRAY_SIZE(Name));
 
 	HTreeClass * base_pose = WW3DAssetManager::Get_Instance()->Get_HTree(HierarchyName);
 	if (base_pose == NULL) {
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp
@@ -212,8 +212,8 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)
 	}
 
 	strcpy(Name,aheader.HierarchyName);
-	strcat(Name,".");
-	strcat(Name,aheader.Name);
+	strlcat(Name, ".", ARRAY_SIZE(Name));
+	strlcat(Name, aheader.Name, ARRAY_SIZE(Name));
 
 	// TSS chasing crash bug 05/26/99
    WWASSERT(HierarchyName != NULL);
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp
@@ -1616,9 +1616,9 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)
 
 	if (strlen(header.ContainerName) > 0) {
 		strcpy(tmpname,header.ContainerName);
-		strcat(tmpname,".");
+		strlcat(tmpname, ".", namelen);
 	}
-	strcat(tmpname,header.MeshName);
+	strlcat(tmpname,header.MeshName, namelen);
 
 	Set_Name(tmpname);
 
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp
@@ -275,9 +275,9 @@ WW3DErrorType MeshModelClass::Load_W3D(ChunkLoadClass & cload)
 
 	if (strlen(context->Header.ContainerName) > 0) {
 		strcpy(tmpname,context->Header.ContainerName);
-		strcat(tmpname,".");
+		strlcat(tmpname, ".", namelen);
 	}
-	strcat(tmpname,context->Header.MeshName);
+	strlcat(tmpname, context->Header.MeshName, namelen);
 
 	Set_Name(tmpname);
 
diff --git a/GeneralsMD/Code/Main/WinMain.cpp b/GeneralsMD/Code/Main/WinMain.cpp
@@ -837,7 +837,7 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		const char *fileName = "Install_Final.bmp";
 		static const char *localizedPathFormat = "Data/%s/";
 		sprintf(filePath,localizedPathFormat, GetRegistryLanguage().str());
-		strcat( filePath, fileName );
+		strlcat(filePath, fileName, _MAX_PATH);
 		FILE *fileImage = fopen(filePath, "r");
 		if (fileImage) {
 			fclose(fileImage);
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp
@@ -948,8 +948,8 @@ HWND InitListboxPropertiesDialog( GameWindow *window )
 		sprintf(percentages,"%d",listData->columnWidthPercentage[0]);
 		for(Int i = 1; i < listData->columns; i++ )
 		{
-			strcat(percentages,",");
-			strcat(percentages,itoa(listData->columnWidthPercentage[i],tempStr,10));
+			strlcat(percentages, ",", ARRAY_SIZE(percentages));
+			strlcat(percentages, itoa(listData->columnWidthPercentage[i],tempStr,10), ARRAY_SIZE(percentages));
 		}
 		SetDlgItemText(dialog,EDIT_COLUMN_PERCENT,percentages);
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/GUIEditWindowManager.cpp
@@ -515,7 +515,7 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 	if( len == 0 )
 	{
 
-		strcat( name, "1" );
+		strlcat(name, "1", MAX_WINDOW_NAME_LEN);
 		goto cleanup;
 
 	}
@@ -586,7 +586,7 @@ void GUIEditWindowManager::incrementName( GameWindow *window )
 	{
 
 		// no number at end, easy ... just append a number '1'
-		strcat( name, "1" );
+		strlcat(name, "1", MAX_WINDOW_NAME_LEN);
 
 	}
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/HierarchyView.cpp
@@ -891,8 +891,8 @@ char *HierarchyView::getWindowTreeName( GameWindow *window )
 	if( !instData->m_decoratedNameString.isEmpty() )
 	{
 
-		strcat( buffer, ": " );
-		strcat( buffer, instData->m_decoratedNameString.str() );
+		strlcat(buffer, ": ", ARRAY_SIZE(buffer));
+		strlcat(buffer, instData->m_decoratedNameString.str(), ARRAY_SIZE(buffer));
 
 	}
 
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Save.cpp
@@ -230,10 +230,10 @@ static Bool saveStatus( GameWindow *window, FILE *fp, Int dataIndent )
 
 			// if this is an additional bit add a +
 			if( bitWritten == TRUE )
-				strcat( buffer, "+");
+				strlcat(buffer, "+", ARRAY_SIZE(buffer));
 
 			// add status name
-			strcat( buffer, WindowStatusNames[ i ] );
+			strlcat(buffer, WindowStatusNames[ i ], ARRAY_SIZE(buffer));
 			bitWritten = TRUE;
 
 		}
@@ -243,10 +243,10 @@ static Bool saveStatus( GameWindow *window, FILE *fp, Int dataIndent )
 
 	// if no bits written write NONE in the file
 	if( bitWritten == FALSE )
-		strcat( buffer, "NONE" );
+		strlcat(buffer, "NONE", ARRAY_SIZE(buffer));
 
 	// complete line and write
-	strcat( buffer, ";\n" );
+	strlcat(buffer, ";\n", ARRAY_SIZE(buffer));
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
@@ -274,10 +274,10 @@ static Bool saveStyle( GameWindow *window, FILE *fp, Int dataIndent )
 
 			// if this is an additional bit add a +
 			if( bitWritten == TRUE )
-				strcat( buffer, "+");
+				strlcat(buffer, "+", ARRAY_SIZE(buffer));
 
 			// add status name
-			strcat( buffer, WindowStyleNames[ i ] );
+			strlcat(buffer, WindowStyleNames[ i ], ARRAY_SIZE(buffer));
 			bitWritten = TRUE;
 
 		}
@@ -287,10 +287,10 @@ static Bool saveStyle( GameWindow *window, FILE *fp, Int dataIndent )
 
 	// if no bits written write NONE in the file
 	if( bitWritten == FALSE )
-		strcat( buffer, "NONE" );
+		strlcat(buffer, "NONE", ARRAY_SIZE(buffer));
 
 	// complete line and write
-	strcat( buffer, ";\n" );
+	strlcat(buffer, ";\n", ARRAY_SIZE(buffer));
 	writeBufferToFile( fp, buffer );
 
 	return TRUE;
@@ -1115,11 +1115,11 @@ void GUIEdit::validateNames( GameWindow *root, char *filename, Bool *valid )
 	if( strlen( filename ) + instData->m_decoratedNameString.getLength() >= MAX_WINDOW_NAME_LEN )
 	{
 
-		strcat( offendingNames, "[Too Long] " );
-		strcat( offendingNames, filename );
-		strcat( offendingNames, ":" );
-		strcat( offendingNames, instData->m_decoratedNameString.str() );
-		strcat( offendingNames, "\n");
+		strlcat(offendingNames, "[Too Long] ", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, filename, ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, ":", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, instData->m_decoratedNameString.str(), ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, "\n", ARRAY_SIZE(offendingNames));
 		*valid = FALSE;
 
 	}
@@ -1129,11 +1129,11 @@ void GUIEdit::validateNames( GameWindow *root, char *filename, Bool *valid )
 																	root, instData->m_decoratedNameString ) )
 	{
 
-		strcat( offendingNames, "[Duplicate] " );
-		strcat( offendingNames, filename );
-		strcat( offendingNames, ":" );
-		strcat( offendingNames, instData->m_decoratedNameString.str() );
-		strcat( offendingNames, "\n" );
+		strlcat(offendingNames, "[Duplicate] ", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, filename, ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, ":", ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, instData->m_decoratedNameString.str(), ARRAY_SIZE(offendingNames));
+		strlcat(offendingNames, "\n", ARRAY_SIZE(offendingNames));
 		*valid = FALSE;
 
 	}
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/BuildList.cpp
@@ -756,9 +756,9 @@ void BuildList::OnExport()
 		SidesInfo *pSide = TheSidesList->getSideInfo(m_curSide);
 		Dict *d = TheSidesList->getSideInfo(m_curSide)->getDict();
 		AsciiString name = d->getAsciiString(TheKey_playerName);
-		strcat(curbuf, name.str());
-		strcat(curbuf, "_BuildList");
-		strcat(curbuf, ".ini");
+		strlcat(curbuf, name.str(), _MAX_PATH);
+		strlcat(curbuf, "_BuildList", _MAX_PATH);
+		strlcat(curbuf, ".ini", _MAX_PATH);
 
 		theLogFile = fopen(curbuf, "w");
 		if (theLogFile == NULL)
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/MeshMoldOptions.cpp
@@ -93,7 +93,7 @@ BOOL MeshMoldOptions::OnInitDialog()
 			dirBuf[len] = 0;
 		}
 		strcpy(findBuf, dirBuf);
-		strcat(findBuf, "*.w3d");
+		strlcat(findBuf, "*.w3d", _MAX_PATH);
 
 		FilenameList filenameList;
 		TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.w3d"), filenameList, FALSE);
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/ObjectOptions.cpp
@@ -290,7 +290,7 @@ BOOL ObjectOptions::OnInitDialog()
 			dirBuf[len] = 0;
 		}
 		strcpy(findBuf, dirBuf);
-		strcat(findBuf, "*.*");
+		strlcat(findBuf, "*.*", _MAX_PATH);
 
 		FilenameList filenameList;
 		TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.w3d"), filenameList, FALSE);
@@ -310,8 +310,8 @@ BOOL ObjectOptions::OnInitDialog()
 				}
 
 				strcpy(fileBuf, TEST_STRING);
-				strcat(fileBuf, "/");
-				strcat(fileBuf, token.str());
+				strlcat(fileBuf, "/", _MAX_PATH);
+				strlcat(fileBuf, token.str(), _MAX_PATH);
 				for (i=strlen(fileBuf)-1; i>0; i--) {
 					if (fileBuf[i] == '.') {
 						// strip off .w3d file extension.
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/RoadOptions.cpp
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp

Original file line number	Diff line number	Diff line change
`@@ -782,8 +782,8 @@ AsciiString INI::getNextQuotedAsciiString()`
`782`	`782`
`783`	`783`	`if (strlen(token) > 1 && token[1] != '\t')`
`784`	`784`	`{`
`785`		`- strcat(buff, " ");`
`786`		`- strcat(buff, token);`
	`785`	`+ strlcat(buff, " ", INI_MAX_CHARS_PER_LINE);`
	`786`	`+ strlcat(buff, token, INI_MAX_CHARS_PER_LINE);`
`787`	`787`	`}`
`788`	`788`	`else`
`789`	`789`	`{ Int buflen=strlen(buff);`
`@@ -824,9 +824,9 @@ AsciiString INI::getNextAsciiString()`
`824`	`824`	`if (token) {`
`825`	`825`	`if (strlen(token) > 1 && token[1] != '\t')`
`826`	`826`	`{`
`827`		`- strcat(buff, " ");`
	`827`	`+ strlcat(buff, " ", INI_MAX_CHARS_PER_LINE);`
`828`	`828`	`}`
`829`		`- strcat(buff, token);`
	`829`	`+ strlcat(buff, token, INI_MAX_CHARS_PER_LINE);`
`830`	`830`	`result.set(buff);`
`831`	`831`	`} else {`
`832`	`832`	`Int len = strlen(buff);`
Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )`
`617`	`617`	`else`
`618`	`618`	`{`
`619`	`619`	`sprintf (bytestr, "%02X ", *eip_ptr);`
`620`		`- strcat (scrap, bytestr);`
	`620`	`+ strlcat(scrap, bytestr, ARRAY_SIZE(scrap));`
`621`	`621`	`}`
`622`	`622`	`eip_ptr++;`
`623`	`623`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2138,7 +2138,7 @@ Parameter *Parameter::ReadParameter(DataChunkInput &file)`
`2138`	`2138`	`char newName[256];`
`2139`	`2139`	`strcpy(oldName, pParm->m_string.str());`
`2140`	`2140`	`strcpy(newName, "GLA");`
`2141`		`- strcat(newName, oldName+strlen("Fundamentalist"));`
	`2141`	`+ strlcat(newName, oldName+strlen("Fundamentalist"), ARRAY_SIZE(newName));`
`2142`	`2142`	`pParm->m_string.set(newName);`
`2143`	`2143`	`DEBUG_LOG(("Changing Script Ref from %s to %s", oldName, newName));`
`2144`	`2144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3021,7 +3021,7 @@ void W3DDisplay::takeScreenShot(void)`
`3021`	`3021`	`sprintf( leafname, "%s%.3d.bmp", "sshot", frame_number++);`
`3022`	`3022`	`#endif`
`3023`	`3023`	`strcpy(pathname, TheGlobalData->getPath_UserData().str());`
`3024`		`- strcat(pathname, leafname);`
	`3024`	`+ strlcat(pathname, leafname, ARRAY_SIZE(pathname));`
`3025`	`3025`	`if (_access( pathname, 0 ) == -1)`
`3026`	`3026`	`done = true;`
`3027`	`3027`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ char const * GameFileClass::Set_Name( char const *filename )`
`189`	`189`	`{`
`190`	`190`	`static const char *localizedPathFormat = "Data/%s/Art/W3D/";`
`191`	`191`	`sprintf(m_filePath,localizedPathFormat, GetRegistryLanguage().str());`
`192`		`- strcat( m_filePath, filename );`
	`192`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`193`	`193`
`194`	`194`	`}`
`195`	`195`
`@@ -198,7 +198,7 @@ char const * GameFileClass::Set_Name( char const *filename )`
`198`	`198`	`{`
`199`	`199`	`static const char *localizedPathFormat = "Data/%s/Art/Textures/";`
`200`	`200`	`sprintf(m_filePath,localizedPathFormat, GetRegistryLanguage().str());`
`201`		`- strcat( m_filePath, filename );`
	`201`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`202`	`202`
`203`	`203`	`}`
`204`	`204`
`@@ -215,14 +215,14 @@ char const * GameFileClass::Set_Name( char const *filename )`
`215`	`215`	`{`
`216`	`216`
`217`	`217`	`strcpy( m_filePath, W3D_DIR_PATH );`
`218`		`- strcat( m_filePath, filename );`
	`218`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`219`	`219`
`220`	`220`	`}`
`221`	`221`	`else if( isImageFileType(fileType) )`
`222`	`222`	`{`
`223`	`223`
`224`	`224`	`strcpy( m_filePath, TGA_DIR_PATH );`
`225`		`- strcat( m_filePath, filename );`
	`225`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`226`	`226`
`227`	`227`	`}`
`228`	`228`	`else`
`@@ -243,14 +243,14 @@ char const * GameFileClass::Set_Name( char const *filename )`
`243`	`243`	`{`
`244`	`244`
`245`	`245`	`strcpy( m_filePath, LEGACY_W3D_DIR_PATH );`
`246`		`- strcat( m_filePath, filename );`
	`246`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`247`	`247`
`248`	`248`	`}`
`249`	`249`	`else if( isImageFileType(fileType) )`
`250`	`250`	`{`
`251`	`251`
`252`	`252`	`strcpy( m_filePath, LEGACY_TGA_DIR_PATH );`
`253`		`- strcat( m_filePath, filename );`
	`253`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`254`	`254`
`255`	`255`	`}`
`256`	`256`
`@@ -271,14 +271,14 @@ char const * GameFileClass::Set_Name( char const *filename )`
`271`	`271`	`{`
`272`	`272`
`273`	`273`	`strcpy( m_filePath, TEST_W3D_DIR_PATH );`
`274`		`- strcat( m_filePath, filename );`
	`274`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`275`	`275`
`276`	`276`	`}`
`277`	`277`	`else if( isImageFileType(fileType) )`
`278`	`278`	`{`
`279`	`279`
`280`	`280`	`strcpy( m_filePath, TEST_TGA_DIR_PATH );`
`281`		`- strcat( m_filePath, filename );`
	`281`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`282`	`282`
`283`	`283`	`}`
`284`	`284`
`@@ -295,14 +295,14 @@ char const * GameFileClass::Set_Name( char const *filename )`
`295`	`295`	`{`
`296`	`296`	`sprintf(m_filePath,USER_W3D_DIR_PATH, TheGlobalData->getPath_UserData().str());`
`297`	`297`	`//strcpy( m_filePath, USER_W3D_DIR_PATH );`
`298`		`- strcat( m_filePath, filename );`
	`298`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`299`	`299`
`300`	`300`	`}`
`301`	`301`	`if( isImageFileType(fileType) )`
`302`	`302`	`{`
`303`	`303`	`sprintf(m_filePath,USER_TGA_DIR_PATH, TheGlobalData->getPath_UserData().str());`
`304`	`304`	`//strcpy( m_filePath, USER_TGA_DIR_PATH );`
`305`		`- strcat( m_filePath, filename );`
	`305`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`306`	`306`
`307`	`307`	`}`
`308`	`308`
`@@ -319,7 +319,7 @@ char const * GameFileClass::Set_Name( char const *filename )`
`319`	`319`	`{`
`320`	`320`	`sprintf(m_filePath,MAP_PREVIEW_DIR_PATH, TheGlobalData->getPath_UserData().str());`
`321`	`321`	`//strcpy( m_filePath, USER_TGA_DIR_PATH );`
`322`		`- strcat( m_filePath, filename );`
	`322`	`+ strlcat(m_filePath, filename, ARRAY_SIZE(m_filePath));`
`323`	`323`
`324`	`324`	`}`
`325`	`325`
Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,8 @@ int HRawAnimClass::Load_W3D(ChunkLoadClass & cload)`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`strcpy(Name,aheader.HierarchyName);`
`215`		`- strcat(Name,".");`
`216`		`- strcat(Name,aheader.Name);`
	`215`	`+ strlcat(Name, ".", ARRAY_SIZE(Name));`
	`216`	`+ strlcat(Name, aheader.Name, ARRAY_SIZE(Name));`
`217`	`217`
`218`	`218`	`// TSS chasing crash bug 05/26/99`
`219`	`219`	`WWASSERT(HierarchyName != NULL);`
Original file line number	Diff line number	Diff line change
`@@ -1616,9 +1616,9 @@ WW3DErrorType MeshGeometryClass::Load_W3D(ChunkLoadClass & cload)`
`1616`	`1616`
`1617`	`1617`	`if (strlen(header.ContainerName) > 0) {`
`1618`	`1618`	`strcpy(tmpname,header.ContainerName);`
`1619`		`- strcat(tmpname,".");`
	`1619`	`+ strlcat(tmpname, ".", namelen);`
`1620`	`1620`	`}`
`1621`		`- strcat(tmpname,header.MeshName);`
	`1621`	`+ strlcat(tmpname,header.MeshName, namelen);`
`1622`	`1622`
`1623`	`1623`	`Set_Name(tmpname);`
`1624`	`1624`