Some fixes

Author: Bart Roossien

Core/Libraries/Source/WWVegas/WWDownload/FTP.CPP

@@ -1831,8 +1831,7 @@ bool Prepare_Directories(const char *rootdir, const char *filename)
 	const char *cptr=filename;
 	while(cptr=strchr(cptr,'\\'))
 	{
-		memset(tempstr,0,256);
-		strlcpy(tempstr,filename,cptr-filename);
+		strlcpy(tempstr,filename,cptr-filename + 1);
 		sprintf(newdir,"%s\\%s",rootdir, tempstr);
 		if (!CreateDirectory(newdir, NULL))
 			return false;

Core/Libraries/Source/profile/profile_highlevel.cpp

@@ -92,8 +92,8 @@ ProfileHighLevel::Block::Block(const char *name)
   m_idTime=AddProfile(name,NULL,"msec",6,-4);
 
   char help[256];
-  strlcpy(help, name, sizeof(help) - 2);
-  strcat(help,".c");
+  strlcpy(help, name, sizeof(help) - 3);
+  strlcat(help, ".c", sizeof(help));
   AddProfile(help,NULL,"calls",6,0).Increment();
 
   ProfileGetTime(m_start);

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp

@@ -1485,8 +1485,8 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	strcpy(texture_name, shadowInfo->m_ShadowName);
-	strlcpy(texture_name, ".tga", ARRAY_SIZE(texture_name));
+	strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+	strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 
 	//Check if we previously added a decal using this texture
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
@@ -1589,8 +1589,8 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	strcpy(texture_name, shadowInfo->m_ShadowName);
-	strlcpy(texture_name, ".tga", ARRAY_SIZE(texture_name));
+	strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+	strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 
 	//Check if we previously added a decal using this texture
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
@@ -1722,8 +1722,8 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 				}
 				else
 				{
-					strcpy(texture_name, shadowInfo->m_ShadowName);
-					strlcpy(texture_name, ".tga", ARRAY_SIZE(texture_name));
+					strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+					strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 				}
 
 				st=m_W3DShadowTextureManager->getTexture(texture_name);
@@ -1898,8 +1898,8 @@ W3DProjectedShadow* W3DProjectedShadowManager::createDecalShadow(Shadow::ShadowT
 	}
 	else
 	{
-		strcpy(texture_name, shadowInfo->m_ShadowName);
-		strlcpy(texture_name, ".tga", ARRAY_SIZE(texture_name));
+		strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+		strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 	}
 
 	st=m_W3DShadowTextureManager->getTexture(texture_name);

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DProjectedShadow.cpp

@@ -1485,8 +1485,8 @@ Shadow* W3DProjectedShadowManager::addDecal(Shadow::ShadowTypeInfo *shadowInfo)
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	strcpy(texture_name, shadowInfo->m_ShadowName);
-	strlcpy(texture_name, ".tga", ARRAY_SIZE(texture_name));
+	strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+	strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 
 	//Check if we previously added a decal using this texture
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
@@ -1589,8 +1589,8 @@ Shadow* W3DProjectedShadowManager::addDecal(RenderObjClass *robj, Shadow::Shadow
 	//simple decal using the premade texture specified.
 	//can be always perpendicular to model's z-axis or projected
 	//onto world geometry.
-	strcpy(texture_name, shadowInfo->m_ShadowName);
-	strlcpy(texture_name, ".tga", ARRAY_SIZE(texture_name));
+	strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+	strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 
 	//Check if we previously added a decal using this texture
 	st=m_W3DShadowTextureManager->getTexture(texture_name);
@@ -1722,8 +1722,8 @@ W3DProjectedShadow* W3DProjectedShadowManager::addShadow(RenderObjClass *robj, S
 				}
 				else
 				{
-					strcpy(texture_name, shadowInfo->m_ShadowName);
-					strlcpy(texture_name, ".tga", ARRAY_SIZE(texture_name));
+					strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+					strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 				}
 
 				st=m_W3DShadowTextureManager->getTexture(texture_name);
@@ -1898,8 +1898,8 @@ W3DProjectedShadow* W3DProjectedShadowManager::createDecalShadow(Shadow::ShadowT
 	}
 	else
 	{
-		strcpy(texture_name, shadowInfo->m_ShadowName);
-		strlcpy(texture_name, ".tga", ARRAY_SIZE(texture_name));
+		strlcpy(texture_name, shadowInfo->m_ShadowName, ARRAY_SIZE(texture_name));
+		strlcat(texture_name, ".tga", ARRAY_SIZE(texture_name));
 	}
 
 	st=m_W3DShadowTextureManager->getTexture(texture_name);