TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use strncpy instead of strcpy because again, buffer overflows

Browse source
This commit is contained in:
Glenn Smith 2018-03-06 01:59:05 -05:00
parent 7769da9434
commit 79c34c68db
92 changed files with 298 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/components/component.cpp
View file

@ -548,7 +548,7 @@ const char * Component::getDescriptionText(const char *desc)
if (!Platform::isFile(desc)) if (!Platform::isFile(desc))
{ {
newDesc = new char[dStrlen(desc) + 1]; newDesc = new char[dStrlen(desc) + 1];
dStrcpy(newDesc, desc); dStrcpy(newDesc, desc, dStrlen(desc) + 1);
return newDesc; return newDesc;
} }

2
Engine/source/T3D/decal/decalManager.cpp
View file

@ -1495,7 +1495,7 @@ bool DecalManager::_createDataFile()
// See if we know our current mission name // See if we know our current mission name
char missionName[1024]; char missionName[1024];
dStrcpy( missionName, Con::getVariable( "$Client::MissionFile" ) ); dStrcpy( missionName, Con::getVariable( "$Client::MissionFile" ), 1024 );
char *dot = dStrstr((const char*)missionName, ".mis"); char *dot = dStrstr((const char*)missionName, ".mis");
if(dot) if(dot)
*dot = '\0'; *dot = '\0';

2
Engine/source/T3D/fx/particle.cpp
View file

@ -595,7 +595,7 @@ bool ParticleData::preload(bool server, String &errorStr)
animTexFrames.clear(); animTexFrames.clear();
char* tokCopy = new char[dStrlen(animTexFramesString) + 1]; char* tokCopy = new char[dStrlen(animTexFramesString) + 1];
dStrcpy(tokCopy, animTexFramesString); dStrcpy(tokCopy, animTexFramesString, dStrlen(animTexFramesString) + 1);
char* currTok = dStrtok(tokCopy, " \t"); char* currTok = dStrtok(tokCopy, " \t");
while (currTok != NULL) while (currTok != NULL)

2
Engine/source/T3D/fx/particleEmitter.cpp
View file

@ -609,7 +609,7 @@ bool ParticleEmitterData::onAdd()
// First we parse particleString into a list of particle name tokens // First we parse particleString into a list of particle name tokens
Vector<char*> dataBlocks(__FILE__, __LINE__); Vector<char*> dataBlocks(__FILE__, __LINE__);
char* tokCopy = new char[dStrlen(particleString) + 1]; char* tokCopy = new char[dStrlen(particleString) + 1];
dStrcpy(tokCopy, particleString); dStrcpy(tokCopy, particleString, dStrlen(particleString) + 1);
char* currTok = dStrtok(tokCopy, " \t"); char* currTok = dStrtok(tokCopy, " \t");
while (currTok != NULL) while (currTok != NULL)

4
Engine/source/T3D/item.cpp
View file

@ -1254,7 +1254,7 @@ DefineEngineMethod( Item, getLastStickyPos, const char*, (),,
object->mStickyCollisionPos.y, object->mStickyCollisionPos.y,
object->mStickyCollisionPos.z); object->mStickyCollisionPos.z);
else else
dStrcpy(ret, "0 0 0"); dStrcpy(ret, "0 0 0", bufSize);
return ret; return ret;
} }
@ -1277,7 +1277,7 @@ DefineEngineMethod( Item, getLastStickyNormal, const char *, (),,
object->mStickyCollisionNormal.y, object->mStickyCollisionNormal.y,
object->mStickyCollisionNormal.z); object->mStickyCollisionNormal.z);
else else
dStrcpy(ret, "0 0 0"); dStrcpy(ret, "0 0 0", bufSize);
return ret; return ret;
} }

2
Engine/source/afx/afxMagicMissile.cpp
View file

@ -447,7 +447,7 @@ bool afxMagicMissileData::onAdd()
// make a copy of points_string // make a copy of points_string
char* tokCopy = new char[dStrlen(wiggle_axis_string) + 1]; char* tokCopy = new char[dStrlen(wiggle_axis_string) + 1];
dStrcpy(tokCopy, wiggle_axis_string); dStrcpy(tokCopy, wiggle_axis_string, dStrlen(wiggle_axis_string) + 1);
// extract tokens one by one, adding them to dataBlocks // extract tokens one by one, adding them to dataBlocks
char* currTok = dStrtok(tokCopy, " \t"); char* currTok = dStrtok(tokCopy, " \t");

6
Engine/source/afx/ce/afxParticleEmitter.cpp
View file

@ -142,7 +142,7 @@ bool afxParticleEmitterData::onAdd()
{ {
Vector<char*> dataBlocks(__FILE__, __LINE__); Vector<char*> dataBlocks(__FILE__, __LINE__);
char* tokCopy = new char[dStrlen(tpaths_string) + 1]; char* tokCopy = new char[dStrlen(tpaths_string) + 1];
dStrcpy(tokCopy, tpaths_string); dStrcpy(tokCopy, tpaths_string, dStrlen(tpaths_string) + 1);
char* currTok = dStrtok(tokCopy, " \t"); char* currTok = dStrtok(tokCopy, " \t");
while (currTok != NULL) while (currTok != NULL)
@ -468,7 +468,7 @@ bool afxParticleEmitterPathData::onAdd()
{ {
Vector<char*> dataBlocks(__FILE__, __LINE__); Vector<char*> dataBlocks(__FILE__, __LINE__);
char* tokCopy = new char[dStrlen(epaths_string) + 1]; char* tokCopy = new char[dStrlen(epaths_string) + 1];
dStrcpy(tokCopy, epaths_string); dStrcpy(tokCopy, epaths_string, dStrlen(epaths_string) + 1);
char* currTok = dStrtok(tokCopy, " \t"); char* currTok = dStrtok(tokCopy, " \t");
while (currTok != NULL) while (currTok != NULL)
@ -553,7 +553,7 @@ void afxParticleEmitterPathData::onPerformSubstitutions()
{ {
Vector<char*> dataBlocks(__FILE__, __LINE__); Vector<char*> dataBlocks(__FILE__, __LINE__);
char* tokCopy = new char[dStrlen(epaths_string) + 1]; char* tokCopy = new char[dStrlen(epaths_string) + 1];
dStrcpy(tokCopy, epaths_string); dStrcpy(tokCopy, epaths_string, dStrlen(epaths_string) + 1);
char* currTok = dStrtok(tokCopy, " \t"); char* currTok = dStrtok(tokCopy, " \t");
while (currTok != NULL) while (currTok != NULL)

6
Engine/source/afx/ea/afxEA_PhraseEffect.cpp
View file

@ -272,10 +272,10 @@ void afxEA_PhraseEffect::trigger_new_phrase()
if (phrase_fx_data->on_trig_cmd != ST_NULLSTRING) if (phrase_fx_data->on_trig_cmd != ST_NULLSTRING)
{ {
char obj_str[32]; char obj_str[32];
dStrcpy(obj_str, Con::getIntArg(choreographer->getId())); dStrcpy(obj_str, Con::getIntArg(choreographer->getId()), 32);
char index_str[32]; char index_str[32];
dStrcpy(index_str, Con::getIntArg(group_index)); dStrcpy(index_str, Con::getIntArg(group_index), 32);
char buffer[1024]; char buffer[1024];
char* b = buffer; char* b = buffer;
@ -382,4 +382,4 @@ bool afxEA_PhraseEffectDesc::requiresStop(const afxEffectWrapperData* ew, const
return (timing.lifetime < 0); return (timing.lifetime < 0);
} }
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

8
Engine/source/afx/rpg/afxRPGMagicSpell.cpp
View file

@ -194,7 +194,7 @@ char* afxRPGMagicSpellData::fmt_placeholder_desc(char* buffer, int len) const
{ {
char pack_str[32]; char pack_str[32];
if (source_pack == ST_NULLSTRING) if (source_pack == ST_NULLSTRING)
dStrcpy(pack_str, "unknown"); dStrcpy(pack_str, "unknown", 32);
else else
dSprintf(pack_str, 32, "%s", source_pack); dSprintf(pack_str, 32, "%s", source_pack);
@ -225,7 +225,7 @@ char* afxRPGMagicSpellData::formatDesc(char* buffer, int len) const
{ {
if (spell_target != TARGET_NOTHING) if (spell_target != TARGET_NOTHING)
{ {
dStrcpy(target_str, _afxRPGMagicSpell_TargetType::_sEnumTable[i].mName); dStrcpy(target_str, _afxRPGMagicSpell_TargetType::_sEnumTable[i].mName, 32);
if (spell_target != TARGET_FREE && target_optional) if (spell_target != TARGET_FREE && target_optional)
dStrcat(target_str, " (opt)", 32); dStrcat(target_str, " (opt)", 32);
} }
@ -245,13 +245,13 @@ char* afxRPGMagicSpellData::formatDesc(char* buffer, int len) const
char casting_str[32]; char casting_str[32];
if (casting_dur <= 0) if (casting_dur <= 0)
dStrcpy(casting_str, "instant"); dStrcpy(casting_str, "instant", 32);
else else
dSprintf(casting_str, 32, "%.1f sec cast", casting_dur); dSprintf(casting_str, 32, "%.1f sec cast", casting_dur);
char pack_str[32]; char pack_str[32];
if (source_pack == ST_NULLSTRING) if (source_pack == ST_NULLSTRING)
dStrcpy(pack_str, "unknown"); dStrcpy(pack_str, "unknown", 32);
else else
dSprintf(pack_str, 32, "%s", source_pack); dSprintf(pack_str, 32, "%s", source_pack);

16
Engine/source/afx/ui/afxSpellButton.cpp
View file

@ -171,10 +171,11 @@ void afxSpellButton::setBitmap(const char *name, bool placeholder)
if (placeholder) if (placeholder)
{ {
dStrcpy(buffer, name); dStrcpy(buffer, name, 1024);
S32 pLen = 1024 - dStrlen(buffer);
p = buffer + dStrlen(buffer); p = buffer + dStrlen(buffer);
dStrcpy(p, "_i"); dStrcpy(p, "_i", pLen);
mTextureInactive.set(buffer, COOLDOWN_PROFILE); mTextureInactive.set(buffer, COOLDOWN_PROFILE);
mTextureNormal = mTextureInactive; mTextureNormal = mTextureInactive;
mTextureHilight = mTextureInactive; mTextureHilight = mTextureInactive;
@ -183,19 +184,20 @@ void afxSpellButton::setBitmap(const char *name, bool placeholder)
} }
else else
{ {
dStrcpy(buffer, name); dStrcpy(buffer, name, 1024);
S32 pLen = 1024 - dStrlen(buffer);
p = buffer + dStrlen(buffer); p = buffer + dStrlen(buffer);
dStrcpy(p, "_n"); dStrcpy(p, "_n", pLen);
mTextureNormal.set(buffer, COOLDOWN_PROFILE); mTextureNormal.set(buffer, COOLDOWN_PROFILE);
dStrcpy(p, "_h"); dStrcpy(p, "_h", pLen);
mTextureHilight.set(buffer, COOLDOWN_PROFILE); mTextureHilight.set(buffer, COOLDOWN_PROFILE);
if (!mTextureHilight) if (!mTextureHilight)
mTextureHilight = mTextureNormal; mTextureHilight = mTextureNormal;
dStrcpy(p, "_d"); dStrcpy(p, "_d", pLen);
mTextureDepressed.set(buffer, COOLDOWN_PROFILE); mTextureDepressed.set(buffer, COOLDOWN_PROFILE);
if (!mTextureDepressed) if (!mTextureDepressed)
mTextureDepressed = mTextureHilight; mTextureDepressed = mTextureHilight;
dStrcpy(p, "_i"); dStrcpy(p, "_i", pLen);
mTextureInactive.set(buffer, COOLDOWN_PROFILE); mTextureInactive.set(buffer, COOLDOWN_PROFILE);
if (!mTextureInactive) if (!mTextureInactive)
mTextureInactive = mTextureNormal; mTextureInactive = mTextureNormal;

2
Engine/source/afx/xm/afxXM_PathConform.cpp
View file

@ -195,7 +195,7 @@ bool afxXM_PathConformData::onAdd()
{ {
Vector<char*> dataBlocks(__FILE__, __LINE__); Vector<char*> dataBlocks(__FILE__, __LINE__);
char* tokCopy = new char[dStrlen(paths_string) + 1]; char* tokCopy = new char[dStrlen(paths_string) + 1];
dStrcpy(tokCopy, paths_string); dStrcpy(tokCopy, paths_string, dStrlen(paths_string) + 1);
char* currTok = dStrtok(tokCopy, " \t"); char* currTok = dStrtok(tokCopy, " \t");
while (currTok != NULL) while (currTok != NULL)

6
Engine/source/app/badWordFilter.cpp
View file

@ -50,7 +50,7 @@ BadWordFilter::BadWordFilter()
{ {
VECTOR_SET_ASSOCIATION( filterTables ); VECTOR_SET_ASSOCIATION( filterTables );
dStrcpy(defaultReplaceStr, "knqwrtlzs"); dStrcpy(defaultReplaceStr, "knqwrtlzs", 32);
filterTables.push_back(new FilterTable); filterTables.push_back(new FilterTable);
curOffset = 0; curOffset = 0;
} }
@ -147,7 +147,7 @@ bool BadWordFilter::setDefaultReplaceStr(const char *str)
U32 len = dStrlen(str); U32 len = dStrlen(str);
if(len < 2 || len >= sizeof(defaultReplaceStr)) if(len < 2 || len >= sizeof(defaultReplaceStr))
return false; return false;
dStrcpy(defaultReplaceStr, str); dStrcpy(defaultReplaceStr, str, 32);
return true; return true;
} }
@ -287,7 +287,7 @@ DefineEngineFunction(filterString, const char *, (const char* baseString, const
replaceStr = gBadWordFilter->getDefaultReplaceStr(); replaceStr = gBadWordFilter->getDefaultReplaceStr();
char *ret = Con::getReturnBuffer(dStrlen(baseString) + 1); char *ret = Con::getReturnBuffer(dStrlen(baseString) + 1);
dStrcpy(ret, baseString); dStrcpy(ret, baseString, dStrlen(baseString));
gBadWordFilter->filterString(ret, replaceStr); gBadWordFilter->filterString(ret, replaceStr);
return ret; return ret;
} }

2
Engine/source/app/banList.cpp
View file

@ -86,7 +86,7 @@ void BanList::addBan(S32 uniqueId, const char *TA, S32 banTime)
} }
BanInfo b; BanInfo b;
dStrcpy(b.transportAddress, TA); dStrcpy(b.transportAddress, TA, 128);
b.uniqueId = uniqueId; b.uniqueId = uniqueId;
b.bannedUntil = banTime; b.bannedUntil = banTime;

2
Engine/source/app/mainLoop.cpp
View file

@ -495,7 +495,7 @@ bool StandardMainLoop::handleCommandLine( S32 argc, const char **argv )
S32 pathLen = dStrlen( fdd.mFile ); S32 pathLen = dStrlen( fdd.mFile );
FrameTemp<char> szPathCopy( pathLen + 1); FrameTemp<char> szPathCopy( pathLen + 1);
dStrcpy( szPathCopy, fdd.mFile ); dStrcpy( szPathCopy, fdd.mFile, pathLen + 1 );
//forwardslash( szPathCopy ); //forwardslash( szPathCopy );
const char *path = dStrrchr(szPathCopy, '/'); const char *path = dStrrchr(szPathCopy, '/');

6
Engine/source/app/net/net.cpp
View file

@ -128,7 +128,7 @@
const char *rmtCommandName = dStrchr(mArgv[1], ' ') + 1; const char *rmtCommandName = dStrchr(mArgv[1], ' ') + 1;
if(conn->isConnectionToServer()) if(conn->isConnectionToServer())
{ {
dStrcpy(mBuf, "clientCmd"); dStrcpy(mBuf, "clientCmd", 1024);
dStrcat(mBuf, rmtCommandName, 1024); dStrcat(mBuf, rmtCommandName, 1024);
char *temp = mArgv[1]; char *temp = mArgv[1];
@ -139,7 +139,7 @@
} }
else else
{ {
dStrcpy(mBuf, "serverCmd"); dStrcpy(mBuf, "serverCmd", 1024);
dStrcat(mBuf, rmtCommandName, 1024); dStrcat(mBuf, rmtCommandName, 1024);
char *temp = mArgv[1]; char *temp = mArgv[1];
@ -409,7 +409,7 @@ ConsoleFunction( buildTaggedString, const char*, 2, 11, "(string format, ...)"
S32 strLength = dStrlen(argStr); S32 strLength = dStrlen(argStr);
if (strLength > strMaxLength) if (strLength > strMaxLength)
goto done; goto done;
dStrcpy(strBufPtr, argStr); dStrcpy(strBufPtr, argStr, strMaxLength);
strBufPtr += strLength; strBufPtr += strLength;
strMaxLength -= strLength; strMaxLength -= strLength;
fmtStrPtr += 2; fmtStrPtr += 2;

4
Engine/source/app/net/netExamples.cpp
View file

@ -110,7 +110,7 @@ public:
SimpleNetObject() SimpleNetObject()
{ {
mNetFlags.set(ScopeAlways | Ghostable); mNetFlags.set(ScopeAlways | Ghostable);
dStrcpy(message, "Hello World!"); dStrcpy(message, "Hello World!", 256);
} }
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream)
{ {
@ -125,7 +125,7 @@ public:
void setMessage(const char *msg) void setMessage(const char *msg)
{ {
setMaskBits(1); setMaskBits(1);
dStrcpy(message, msg); dStrcpy(message, msg, 256);
} }
DECLARE_CONOBJECT(SimpleNetObject); DECLARE_CONOBJECT(SimpleNetObject);

38
Engine/source/app/net/serverQuery.cpp
View file

@ -394,12 +394,12 @@ void queryLanServers(U32 port, U8 flags, const char* gameType, const char* missi
if ( !sActiveFilter.gameType || dStricmp( sActiveFilter.gameType, "Any" ) != 0 ) if ( !sActiveFilter.gameType || dStricmp( sActiveFilter.gameType, "Any" ) != 0 )
{ {
sActiveFilter.gameType = (char*) dRealloc( sActiveFilter.gameType, 4 ); sActiveFilter.gameType = (char*) dRealloc( sActiveFilter.gameType, 4 );
dStrcpy( sActiveFilter.gameType, "Any" ); dStrcpy( sActiveFilter.gameType, "Any", 4 );
} }
if ( !sActiveFilter.missionType || dStricmp( sActiveFilter.missionType, "Any" ) != 0 ) if ( !sActiveFilter.missionType || dStricmp( sActiveFilter.missionType, "Any" ) != 0 )
{ {
sActiveFilter.missionType = (char*) dRealloc( sActiveFilter.missionType, 4 ); sActiveFilter.missionType = (char*) dRealloc( sActiveFilter.missionType, 4 );
dStrcpy( sActiveFilter.missionType, "Any" ); dStrcpy( sActiveFilter.missionType, "Any", 4 );
} }
sActiveFilter.queryFlags = 0; sActiveFilter.queryFlags = 0;
sActiveFilter.minPlayers = minPlayers; sActiveFilter.minPlayers = minPlayers;
@ -511,13 +511,13 @@ void queryMasterServer(U8 flags, const char* gameType, const char* missionType,
if ( !sActiveFilter.gameType || dStrcmp( sActiveFilter.gameType, gameType ) != 0 ) if ( !sActiveFilter.gameType || dStrcmp( sActiveFilter.gameType, gameType ) != 0 )
{ {
sActiveFilter.gameType = (char*) dRealloc( sActiveFilter.gameType, dStrlen( gameType ) + 1 ); sActiveFilter.gameType = (char*) dRealloc( sActiveFilter.gameType, dStrlen( gameType ) + 1 );
dStrcpy( sActiveFilter.gameType, gameType ); dStrcpy( sActiveFilter.gameType, gameType, dStrlen(gameType) + 1 );
} }
if ( !sActiveFilter.missionType || dStrcmp( sActiveFilter.missionType, missionType ) != 0 ) if ( !sActiveFilter.missionType || dStrcmp( sActiveFilter.missionType, missionType ) != 0 )
{ {
sActiveFilter.missionType = (char*) dRealloc( sActiveFilter.missionType, dStrlen( missionType ) + 1 ); sActiveFilter.missionType = (char*) dRealloc( sActiveFilter.missionType, dStrlen( missionType ) + 1 );
dStrcpy( sActiveFilter.missionType, missionType ); dStrcpy( sActiveFilter.missionType, missionType, dStrlen(missionType) + 1 );
} }
sActiveFilter.queryFlags = flags | ServerFilter::NewStyleResponse; sActiveFilter.queryFlags = flags | ServerFilter::NewStyleResponse;
@ -970,7 +970,7 @@ static void pushServerFavorites()
ServerInfo* si = findOrCreateServerInfo( &addr ); ServerInfo* si = findOrCreateServerInfo( &addr );
AssertFatal(si, "pushServerFavorites - failed to create Server Info!" ); AssertFatal(si, "pushServerFavorites - failed to create Server Info!" );
si->name = (char*) dRealloc( (void*) si->name, dStrlen( serverName ) + 1 ); si->name = (char*) dRealloc( (void*) si->name, dStrlen( serverName ) + 1 );
dStrcpy( si->name, serverName ); dStrcpy( si->name, serverName, dStrlen(serverName) + 1 );
si->isFavorite = true; si->isFavorite = true;
pushPingRequest( &addr ); pushPingRequest( &addr );
} }
@ -1054,13 +1054,13 @@ void addFakeServers( S32 howMany )
char buf[256]; char buf[256];
dSprintf( buf, 255, "Fake server #%d", sNumFakeServers ); dSprintf( buf, 255, "Fake server #%d", sNumFakeServers );
newServer.name = (char*) dMalloc( dStrlen( buf ) + 1 ); newServer.name = (char*) dMalloc( dStrlen( buf ) + 1 );
dStrcpy( newServer.name, buf ); dStrcpy( newServer.name, buf, strlen(buf) + 1 );
newServer.gameType = (char*) dMalloc( 5 ); newServer.gameType = (char*) dMalloc( 5 );
dStrcpy( newServer.gameType, "Fake" ); dStrcpy( newServer.gameType, "Fake", 5 );
newServer.missionType = (char*) dMalloc( 4 ); newServer.missionType = (char*) dMalloc( 16 );
dStrcpy( newServer.missionType, "FakeMissionType" ); dStrcpy( newServer.missionType, "FakeMissionType", 16 );
newServer.missionName = (char*) dMalloc( 14 ); newServer.missionName = (char*) dMalloc( 14 );
dStrcpy( newServer.missionName, "FakeMapName" ); dStrcpy( newServer.missionName, "FakeMapName", 14 );
Net::stringToAddress( "IP:198.74.33.35:28000", &newServer.address ); Net::stringToAddress( "IP:198.74.33.35:28000", &newServer.address );
newServer.ping = (U32)( Platform::getRandom() * 200.0f ); newServer.ping = (U32)( Platform::getRandom() * 200.0f );
newServer.cpuSpeed = 470; newServer.cpuSpeed = 470;
@ -1353,9 +1353,9 @@ static void processPingsAndQueries( U32 session, bool schedule )
char msg[64]; char msg[64];
U32 foundCount = gServerList.size(); U32 foundCount = gServerList.size();
if ( foundCount == 0 ) if ( foundCount == 0 )
dStrcpy( msg, "No servers found." ); dStrcpy( msg, "No servers found.", 64 );
else if ( foundCount == 1 ) else if ( foundCount == 1 )
dStrcpy( msg, "One server found." ); dStrcpy( msg, "One server found.", 64 );
else else
dSprintf( msg, sizeof( msg ), "%d servers found.", foundCount ); dSprintf( msg, sizeof( msg ), "%d servers found.", foundCount );
@ -1754,7 +1754,7 @@ static void handleGameMasterInfoRequest( const NetAddress* address, U32 key, U8
const char* guidList = Con::getVariable( "Server::GuidList" ); const char* guidList = Con::getVariable( "Server::GuidList" );
char* buf = new char[dStrlen( guidList ) + 1]; char* buf = new char[dStrlen( guidList ) + 1];
dStrcpy( buf, guidList ); dStrcpy( buf, guidList, dStrlen(guidList) + 1 );
char* temp = dStrtok( buf, "\t" ); char* temp = dStrtok( buf, "\t" );
temp8 = 0; temp8 = 0;
for ( ; temp && temp8 < playerCount; temp8++ ) for ( ; temp && temp8 < playerCount; temp8++ )
@ -1949,7 +1949,7 @@ static void handleGamePingResponse( const NetAddress* address, BitStream* stream
if ( !si->name ) if ( !si->name )
{ {
si->name = (char*) dMalloc( dStrlen( buf ) + 1 ); si->name = (char*) dMalloc( dStrlen( buf ) + 1 );
dStrcpy( si->name, buf ); dStrcpy( si->name, buf, dStrlen(buf) + 1 );
} }
// Set the server up to be queried: // Set the server up to be queried:
@ -2051,7 +2051,7 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream
if ( !si->gameType || dStricmp( si->gameType, stringBuf ) != 0 ) if ( !si->gameType || dStricmp( si->gameType, stringBuf ) != 0 )
{ {
si->gameType = (char*) dRealloc( (void*) si->gameType, dStrlen( stringBuf ) + 1 ); si->gameType = (char*) dRealloc( (void*) si->gameType, dStrlen( stringBuf ) + 1 );
dStrcpy( si->gameType, stringBuf ); dStrcpy( si->gameType, stringBuf, dStrlen(stringBuf) + 1 );
// Test against the active filter: // Test against the active filter:
if ( applyFilter && dStricmp( sActiveFilter.gameType, "any" ) != 0 if ( applyFilter && dStricmp( sActiveFilter.gameType, "any" ) != 0
@ -2068,7 +2068,7 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream
if ( !si->missionType || dStrcmp( si->missionType, stringBuf ) != 0 ) if ( !si->missionType || dStrcmp( si->missionType, stringBuf ) != 0 )
{ {
si->missionType = (char*) dRealloc( (void*) si->missionType, dStrlen( stringBuf ) + 1 ); si->missionType = (char*) dRealloc( (void*) si->missionType, dStrlen( stringBuf ) + 1 );
dStrcpy( si->missionType, stringBuf ); dStrcpy( si->missionType, stringBuf, dStrlen(stringBuf) + 1 );
// Test against the active filter: // Test against the active filter:
if ( applyFilter && dStricmp( sActiveFilter.missionType, "any" ) != 0 if ( applyFilter && dStricmp( sActiveFilter.missionType, "any" ) != 0
@ -2089,7 +2089,7 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream
if ( !si->missionName || dStrcmp( si->missionName, stringBuf ) != 0 ) if ( !si->missionName || dStrcmp( si->missionName, stringBuf ) != 0 )
{ {
si->missionName = (char*) dRealloc( (void*) si->missionName, dStrlen( stringBuf ) + 1 ); si->missionName = (char*) dRealloc( (void*) si->missionName, dStrlen( stringBuf ) + 1 );
dStrcpy( si->missionName, stringBuf ); dStrcpy( si->missionName, stringBuf, dStrlen(stringBuf) + 1 );
} }
// Get the server status: // Get the server status:
@ -2158,7 +2158,7 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream
if ( !si->statusString || ( isUpdate && dStrcmp( si->statusString, stringBuf ) != 0 ) ) if ( !si->statusString || ( isUpdate && dStrcmp( si->statusString, stringBuf ) != 0 ) )
{ {
si->infoString = (char*) dRealloc( (void*) si->infoString, dStrlen( stringBuf ) + 1 ); si->infoString = (char*) dRealloc( (void*) si->infoString, dStrlen( stringBuf ) + 1 );
dStrcpy( si->infoString, stringBuf ); dStrcpy( si->infoString, stringBuf, dStrlen(stringBuf) + 1 );
} }
// Get the content string: // Get the content string:
@ -2166,7 +2166,7 @@ static void handleGameInfoResponse( const NetAddress* address, BitStream* stream
if ( !si->statusString || ( isUpdate && dStrcmp( si->statusString, stringBuf ) != 0 ) ) if ( !si->statusString || ( isUpdate && dStrcmp( si->statusString, stringBuf ) != 0 ) )
{ {
si->statusString = (char*) dRealloc( (void*) si->statusString, dStrlen( stringBuf ) + 1 ); si->statusString = (char*) dRealloc( (void*) si->statusString, dStrlen( stringBuf ) + 1 );
dStrcpy( si->statusString, stringBuf ); dStrcpy( si->statusString, stringBuf, dStrlen(stringBuf) + 1 );
} }
// Update the server browser gui! // Update the server browser gui!

2
Engine/source/console/CMDscan.cpp
View file

@ -2341,7 +2341,7 @@ static int Sc_ScanString(int ret)
return -1; return -1;
char* buffer = (char*)consoleAlloc(dStrlen(CMDtext)); char* buffer = (char*)consoleAlloc(dStrlen(CMDtext));
dStrcpy(buffer, CMDtext + 1); dStrcpy(buffer, CMDtext + 1, dStrlen(CMDtext));
CMDlval.str = MakeToken< char* >(buffer, lineIndex); CMDlval.str = MakeToken< char* >(buffer, lineIndex);
return ret; return ret;

4
Engine/source/console/SimXMLDocument.cpp
View file

@ -833,7 +833,7 @@ void SimXMLDocument::setObjectAttributes(const char* objectID)
continue; continue;
FrameTemp<char> valCopy( dStrlen( val ) + 1 ); FrameTemp<char> valCopy( dStrlen( val ) + 1 );
dStrcpy( (char *)valCopy, val ); dStrcpy( (char *)valCopy, val, dStrlen(val) + 1 );
if (!pObject->writeField(itr->pFieldname, valCopy)) if (!pObject->writeField(itr->pFieldname, valCopy))
continue; continue;
@ -873,7 +873,7 @@ void SimXMLDocument::setObjectAttributes(const char* objectID)
// continue; // continue;
// FrameTemp<char> valCopy( dStrlen( val ) + 1 ); // FrameTemp<char> valCopy( dStrlen( val ) + 1 );
// dStrcpy( (char *)valCopy, val ); // dStrcpy( (char *)valCopy, val, dStrlen(val) + 1 );
// if (!pObject->writeField(itr->pFieldname, valCopy)) // if (!pObject->writeField(itr->pFieldname, valCopy))
// continue; // continue;

2
Engine/source/console/astAlloc.cpp
View file

@ -241,7 +241,7 @@ StrConstNode *StrConstNode::alloc(S32 lineNumber, char *str, bool tag, bool doc)
ret->str = (char *)consoleAlloc(dStrlen(str) + 1); ret->str = (char *)consoleAlloc(dStrlen(str) + 1);
ret->tag = tag; ret->tag = tag;
ret->doc = doc; ret->doc = doc;
dStrcpy(ret->str, str); dStrcpy(ret->str, str, dStrlen(str) + 1);
return ret; return ret;
} }

26
Engine/source/console/codeInterpreter.cpp
View file

@ -95,19 +95,17 @@ static void getFieldComponent(SimObject* object, StringTableEntry field, const c
// Translate xyzw and rgba into the indexed component // Translate xyzw and rgba into the indexed component
// of the variable or field. // of the variable or field.
//
// Review: Should we use strncpy to prevent a buffer overflow?
if (subField == xyzw[0] || subField == rgba[0]) if (subField == xyzw[0] || subField == rgba[0])
dStrcpy(val, StringUnit::getUnit(prevVal, 0, " \t\n")); dStrcpy(val, StringUnit::getUnit(prevVal, 0, " \t\n"), 128);
else if (subField == xyzw[1] || subField == rgba[1]) else if (subField == xyzw[1] || subField == rgba[1])
dStrcpy(val, StringUnit::getUnit(prevVal, 1, " \t\n")); dStrcpy(val, StringUnit::getUnit(prevVal, 1, " \t\n"), 128);
else if (subField == xyzw[2] || subField == rgba[2]) else if (subField == xyzw[2] || subField == rgba[2])
dStrcpy(val, StringUnit::getUnit(prevVal, 2, " \t\n")); dStrcpy(val, StringUnit::getUnit(prevVal, 2, " \t\n"), 128);
else if (subField == xyzw[3] || subField == rgba[3]) else if (subField == xyzw[3] || subField == rgba[3])
dStrcpy(val, StringUnit::getUnit(prevVal, 3, " \t\n")); dStrcpy(val, StringUnit::getUnit(prevVal, 3, " \t\n"), 128);
else else
val[0] = 0; val[0] = 0;
@ -157,19 +155,17 @@ static void setFieldComponent(SimObject* object, StringTableEntry field, const c
// Insert the value into the specified // Insert the value into the specified
// component of the string. // component of the string.
//
// Review: Should we use strncpy to prevent a buffer overflow?
if (subField == xyzw[0] || subField == rgba[0]) if (subField == xyzw[0] || subField == rgba[0])
dStrcpy(val, StringUnit::setUnit(prevVal, 0, strValue, " \t\n")); dStrcpy(val, StringUnit::setUnit(prevVal, 0, strValue, " \t\n"), 128);
else if (subField == xyzw[1] || subField == rgba[1]) else if (subField == xyzw[1] || subField == rgba[1])
dStrcpy(val, StringUnit::setUnit(prevVal, 1, strValue, " \t\n")); dStrcpy(val, StringUnit::setUnit(prevVal, 1, strValue, " \t\n"), 128);
else if (subField == xyzw[2] || subField == rgba[2]) else if (subField == xyzw[2] || subField == rgba[2])
dStrcpy(val, StringUnit::setUnit(prevVal, 2, strValue, " \t\n")); dStrcpy(val, StringUnit::setUnit(prevVal, 2, strValue, " \t\n"), 128);
else if (subField == xyzw[3] || subField == rgba[3]) else if (subField == xyzw[3] || subField == rgba[3])
dStrcpy(val, StringUnit::setUnit(prevVal, 3, strValue, " \t\n")); dStrcpy(val, StringUnit::setUnit(prevVal, 3, strValue, " \t\n"), 128);
if (val[0] != 0) if (val[0] != 0)
{ {
@ -1729,7 +1725,7 @@ OPCodeReturn CodeInterpreter::op_setcurfield(U32 &ip)
{ {
// Save the previous field for parsing vector fields. // Save the previous field for parsing vector fields.
mPrevField = mCurField; mPrevField = mCurField;
dStrcpy(prevFieldArray, curFieldArray); dStrcpy(prevFieldArray, curFieldArray, 256);
mCurField = CodeToSTE(mCodeBlock->code, ip); mCurField = CodeToSTE(mCodeBlock->code, ip);
curFieldArray[0] = 0; curFieldArray[0] = 0;
ip += 2; ip += 2;
@ -1738,7 +1734,7 @@ OPCodeReturn CodeInterpreter::op_setcurfield(U32 &ip)
OPCodeReturn CodeInterpreter::op_setcurfield_array(U32 &ip) OPCodeReturn CodeInterpreter::op_setcurfield_array(U32 &ip)
{ {
dStrcpy(curFieldArray, STR.getStringValue()); dStrcpy(curFieldArray, STR.getStringValue(), 256);
return OPCodeReturn::success; return OPCodeReturn::success;
} }
@ -1771,7 +1767,7 @@ OPCodeReturn CodeInterpreter::op_setcurfield_this(U32 &ip)
mCurObject = mThisObject; mCurObject = mThisObject;
mPrevField = mCurField; mPrevField = mCurField;
dStrcpy(prevFieldArray, curFieldArray); dStrcpy(prevFieldArray, curFieldArray, 256);
mCurField = CodeToSTE(mCodeBlock->code, ip); mCurField = CodeToSTE(mCodeBlock->code, ip);
curFieldArray[0] = 0; curFieldArray[0] = 0;
ip += 2; ip += 2;

4
Engine/source/console/compiler.cpp
View file

@ -164,7 +164,7 @@ U32 CompilerStringTable::add(const char *str, bool caseSens, bool tag)
newStr->string = (char *)consoleAlloc(len); newStr->string = (char *)consoleAlloc(len);
newStr->len = len; newStr->len = len;
newStr->tag = tag; newStr->tag = tag;
dStrcpy(newStr->string, str); dStrcpy(newStr->string, str, len);
// Put into the hash table. // Put into the hash table.
hashTable[str] = newStr; hashTable[str] = newStr;
@ -195,7 +195,7 @@ char *CompilerStringTable::build()
char *ret = new char[totalLen]; char *ret = new char[totalLen];
dMemset(ret, 0, totalLen); dMemset(ret, 0, totalLen);
for (Entry *walk = list; walk; walk = walk->next) for (Entry *walk = list; walk; walk = walk->next)
dStrcpy(ret + walk->start, walk->string); dStrcpy(ret + walk->start, walk->string, totalLen - walk->start);
return ret; return ret;
} }

30
Engine/source/console/console.cpp
View file

@ -440,7 +440,7 @@ U32 tabComplete(char* inputBuffer, U32 cursorPos, U32 maxResultLength, bool forw
{ {
// If not... // If not...
// Save it for checking next time. // Save it for checking next time.
dStrcpy(tabBuffer, inputBuffer); dStrcpy(tabBuffer, inputBuffer, MaxCompletionBufferSize);
// Scan backward from the cursor position to find the base to complete from. // Scan backward from the cursor position to find the base to complete from.
S32 p = cursorPos; S32 p = cursorPos;
while ((p > 0) && (inputBuffer[p - 1] != ' ') && (inputBuffer[p - 1] != '.') && (inputBuffer[p - 1] != '(')) while ((p > 0) && (inputBuffer[p - 1] != ' ') && (inputBuffer[p - 1] != '.') && (inputBuffer[p - 1] != '('))
@ -527,7 +527,7 @@ U32 tabComplete(char* inputBuffer, U32 cursorPos, U32 maxResultLength, bool forw
} }
// Save the modified input buffer for checking next time. // Save the modified input buffer for checking next time.
dStrcpy(tabBuffer, inputBuffer); dStrcpy(tabBuffer, inputBuffer, MaxCompletionBufferSize);
// Return the new (maybe) cursor position. // Return the new (maybe) cursor position.
return cursorPos; return cursorPos;
@ -647,7 +647,7 @@ static void _printf(ConsoleLogEntry::Level level, ConsoleLogEntry::Type type, co
entry.mType = type; entry.mType = type;
#ifndef TORQUE_SHIPPING // this is equivalent to a memory leak, turn it off in ship build #ifndef TORQUE_SHIPPING // this is equivalent to a memory leak, turn it off in ship build
entry.mString = (const char *)consoleLogChunker.alloc(dStrlen(pos) + 1); entry.mString = (const char *)consoleLogChunker.alloc(dStrlen(pos) + 1);
dStrcpy(const_cast<char*>(entry.mString), pos); dStrcpy(const_cast<char*>(entry.mString), pos, dStrlen(pos) + 1);
// This prevents infinite recursion if the console itself needs to // This prevents infinite recursion if the console itself needs to
// re-allocate memory to accommodate the new console log entry, and // re-allocate memory to accommodate the new console log entry, and
@ -1271,7 +1271,7 @@ bool executeFile(const char* fileName, bool noCalls, bool journalScript)
scriptFile = NULL; scriptFile = NULL;
dsoModifiedTime = dsoFile->getModifiedTime(); dsoModifiedTime = dsoFile->getModifiedTime();
dStrcpy(nameBuffer, scriptFileName); dStrcpy(nameBuffer, scriptFileName, 512);
} }
// If we're supposed to be compiling this file, check to see if there's a DSO // If we're supposed to be compiling this file, check to see if there's a DSO
@ -2097,12 +2097,12 @@ bool expandPath(char* pDstPath, U32 size, const char* pSrcPath, const char* pWor
if (ensureTrailingSlash) if (ensureTrailingSlash)
{ {
// Yes, so ensure it. // Yes, so ensure it.
Con::ensureTrailingSlash(pDstPath, pSrcPath); Con::ensureTrailingSlash(pDstPath, pSrcPath, size);
} }
else else
{ {
// No, so just use the source path. // No, so just use the source path.
dStrcpy(pDstPath, pSrcPath); dStrcpy(pDstPath, pSrcPath, size);
} }
return false; return false;
@ -2118,7 +2118,7 @@ bool expandPath(char* pDstPath, U32 size, const char* pSrcPath, const char* pWor
if (ensureTrailingSlash) if (ensureTrailingSlash)
{ {
// Yes, so ensure it. // Yes, so ensure it.
Con::ensureTrailingSlash(pathBuffer, pathBuffer); Con::ensureTrailingSlash(pathBuffer, pathBuffer, size);
} }
// Strip repeat slashes. // Strip repeat slashes.
@ -2143,12 +2143,12 @@ bool expandPath(char* pDstPath, U32 size, const char* pSrcPath, const char* pWor
if (ensureTrailingSlash) if (ensureTrailingSlash)
{ {
// Yes, so ensure it. // Yes, so ensure it.
Con::ensureTrailingSlash(pDstPath, pSrcPath); Con::ensureTrailingSlash(pDstPath, pSrcPath, size);
} }
else else
{ {
// No, so just use the source path. // No, so just use the source path.
dStrcpy(pDstPath, pSrcPath); dStrcpy(pDstPath, pSrcPath, size);
} }
return false; return false;
@ -2183,7 +2183,7 @@ bool expandPath(char* pDstPath, U32 size, const char* pSrcPath, const char* pWor
if (ensureTrailingSlash) if (ensureTrailingSlash)
{ {
// Yes, so ensure it. // Yes, so ensure it.
Con::ensureTrailingSlash(pathBuffer, pathBuffer); Con::ensureTrailingSlash(pathBuffer, pathBuffer, size);
} }
// Strip repeat slashes. // Strip repeat slashes.
@ -2208,7 +2208,7 @@ bool expandPath(char* pDstPath, U32 size, const char* pSrcPath, const char* pWor
if (ensureTrailingSlash) if (ensureTrailingSlash)
{ {
// Yes, so ensure it. // Yes, so ensure it.
Con::ensureTrailingSlash(pathBuffer, pathBuffer); Con::ensureTrailingSlash(pathBuffer, pathBuffer, size);
} }
// Strip repeat slashes. // Strip repeat slashes.
@ -2300,10 +2300,10 @@ void collapsePath(char* pDstPath, U32 size, const char* pSrcPath, const char* pW
} }
void ensureTrailingSlash(char* pDstPath, const char* pSrcPath) void ensureTrailingSlash(char* pDstPath, const char* pSrcPath, S32 dstSize)
{ {
// Copy to target. // Copy to target.
dStrcpy(pDstPath, pSrcPath); dStrcpy(pDstPath, pSrcPath, dstSize);
// Find trailing character index. // Find trailing character index.
S32 trailIndex = dStrlen(pDstPath); S32 trailIndex = dStrlen(pDstPath);
@ -2353,7 +2353,7 @@ StringTableEntry getDSOPath(const char *scriptPath)
else else
{ {
StringTableEntry strippedPath = Platform::stripBasePath(scriptPath); StringTableEntry strippedPath = Platform::stripBasePath(scriptPath);
dStrcpy(relPath, strippedPath); dStrcpy(relPath, strippedPath, 1024);
char *slash = dStrrchr(relPath, '/'); char *slash = dStrrchr(relPath, '/');
if (slash) if (slash)
@ -2616,7 +2616,7 @@ const char *ConsoleValue::getStringValue()
else if(newLen > bufferLen) else if(newLen > bufferLen)
sval = (char *) dRealloc(sval, newLen); sval = (char *) dRealloc(sval, newLen);
dStrcpy(sval, internalValue); dStrcpy(sval, internalValue, newLen);
bufferLen = newLen; bufferLen = newLen;
return sval; return sval;

2
Engine/source/console/console.h
View file

@ -491,7 +491,7 @@ namespace Con
bool expandPath(char* pDstPath, U32 size, const char* pSrcPath, const char* pWorkingDirectoryHint = NULL, const bool ensureTrailingSlash = false); bool expandPath(char* pDstPath, U32 size, const char* pSrcPath, const char* pWorkingDirectoryHint = NULL, const bool ensureTrailingSlash = false);
void collapsePath(char* pDstPath, U32 size, const char* pSrcPath, const char* pWorkingDirectoryHint = NULL); void collapsePath(char* pDstPath, U32 size, const char* pSrcPath, const char* pWorkingDirectoryHint = NULL);
bool isBasePath(const char* SrcPath, const char* pBasePath); bool isBasePath(const char* SrcPath, const char* pBasePath);
void ensureTrailingSlash(char* pDstPath, const char* pSrcPath); void ensureTrailingSlash(char* pDstPath, const char* pSrcPath, S32 dstSize);
bool stripRepeatSlashes(char* pDstPath, const char* pSrcPath, S32 dstSize); bool stripRepeatSlashes(char* pDstPath, const char* pSrcPath, S32 dstSize);
StringTableEntry getDSOPath(const char *scriptPath); StringTableEntry getDSOPath(const char *scriptPath);

4
Engine/source/console/consoleDoc.cpp
View file

@ -90,7 +90,7 @@ void printClassHeader(const char* usage, const char * className, const char * su
// Copy Usage Document // Copy Usage Document
S32 usageLen = dStrlen( usage ); S32 usageLen = dStrlen( usage );
FrameTemp<char> usageStr( usageLen ); FrameTemp<char> usageStr( usageLen );
dStrcpy( usageStr, usage ); dStrcpy( usageStr, usage, usageLen );
// Print Header // Print Header
Con::printf( "/*!" ); Con::printf( "/*!" );
@ -117,7 +117,7 @@ void printClassHeader(const char* usage, const char * className, const char * su
} }
// Copy line and update usagePtr // Copy line and update usagePtr
dStrcpy( lineStr, usagePtr ); dStrcpy( lineStr, usagePtr, 2048 );
usagePtr = (newLine != NULL ) ? newLine : usagePtr; usagePtr = (newLine != NULL ) ? newLine : usagePtr;
lineLen = dStrlen( lineStr ); lineLen = dStrlen( lineStr );

36
Engine/source/console/consoleFunctions.cpp
View file

@ -561,12 +561,13 @@ DefineConsoleFunction( stripChars, const char*, ( const char* str, const char* c
"@endtsexample\n" "@endtsexample\n"
"@ingroup Strings" ) "@ingroup Strings" )
{ {
char* ret = Con::getReturnBuffer( dStrlen( str ) + 1 ); S32 len = dStrlen(str) + 1;
dStrcpy( ret, str ); char* ret = Con::getReturnBuffer( len );
dStrcpy( ret, str, len );
U32 pos = dStrcspn( ret, chars ); U32 pos = dStrcspn( ret, chars );
while ( pos < dStrlen( ret ) ) while ( pos < dStrlen( ret ) )
{ {
dStrcpy( ret + pos, ret + pos + 1 ); dStrcpy( ret + pos, ret + pos + 1, len - pos );
pos = dStrcspn( ret, chars ); pos = dStrcspn( ret, chars );
} }
return( ret ); return( ret );
@ -585,7 +586,7 @@ DefineConsoleFunction( strlwr, const char*, ( const char* str ),,
"@ingroup Strings" ) "@ingroup Strings" )
{ {
char *ret = Con::getReturnBuffer(dStrlen(str) + 1); char *ret = Con::getReturnBuffer(dStrlen(str) + 1);
dStrcpy(ret, str); dStrcpy(ret, str, dStrlen(str) + 1);
return dStrlwr(ret); return dStrlwr(ret);
} }
@ -602,7 +603,7 @@ DefineConsoleFunction( strupr, const char*, ( const char* str ),,
"@ingroup Strings" ) "@ingroup Strings" )
{ {
char *ret = Con::getReturnBuffer(dStrlen(str) + 1); char *ret = Con::getReturnBuffer(dStrlen(str) + 1);
dStrcpy(ret, str); dStrcpy(ret, str, dStrlen(str) + 1);
return dStrupr(ret); return dStrupr(ret);
} }
@ -663,7 +664,8 @@ DefineConsoleFunction( strreplace, const char*, ( const char* source, const char
count++; count++;
} }
} }
char *ret = Con::getReturnBuffer(dStrlen(source) + 1 + (toLen - fromLen) * count); S32 retLen = dStrlen(source) + 1 + (toLen - fromLen) * count;
char *ret = Con::getReturnBuffer(retLen);
U32 scanp = 0; U32 scanp = 0;
U32 dstp = 0; U32 dstp = 0;
for(;;) for(;;)
@ -671,13 +673,13 @@ DefineConsoleFunction( strreplace, const char*, ( const char* source, const char
const char *scan = dStrstr(source + scanp, from); const char *scan = dStrstr(source + scanp, from);
if(!scan) if(!scan)
{ {
dStrcpy(ret + dstp, source + scanp); dStrcpy(ret + dstp, source + scanp, retLen - dstp);
return ret; return ret;
} }
U32 len = scan - (source + scanp); U32 len = scan - (source + scanp);
dStrncpy(ret + dstp, source + scanp, len); dStrncpy(ret + dstp, source + scanp, getMin(len, retLen - dstp));
dstp += len; dstp += len;
dStrcpy(ret + dstp, to); dStrcpy(ret + dstp, to, retLen - dstp);
dstp += toLen; dstp += toLen;
scanp += len + fromLen; scanp += len + fromLen;
} }
@ -901,8 +903,8 @@ DefineConsoleFunction( startsWith, bool, ( const char* str, const char* prefix,
char* targetBuf = new char[ targetLen + 1 ]; char* targetBuf = new char[ targetLen + 1 ];
// copy src and target into buffers // copy src and target into buffers
dStrcpy( srcBuf, str ); dStrcpy( srcBuf, str, srcLen + 1 );
dStrcpy( targetBuf, prefix ); dStrcpy( targetBuf, prefix, targetLen + 1 );
// reassign src/target pointers to lowercase versions // reassign src/target pointers to lowercase versions
str = dStrlwr( srcBuf ); str = dStrlwr( srcBuf );
@ -952,8 +954,8 @@ DefineConsoleFunction( endsWith, bool, ( const char* str, const char* suffix, bo
char* targetBuf = new char[ targetLen + 1 ]; char* targetBuf = new char[ targetLen + 1 ];
// copy src and target into buffers // copy src and target into buffers
dStrcpy( srcBuf, str ); dStrcpy( srcBuf, str, srcLen + 1 );
dStrcpy( targetBuf, suffix ); dStrcpy( targetBuf, suffix, targetLen + 1 );
// reassign src/target pointers to lowercase versions // reassign src/target pointers to lowercase versions
str = dStrlwr( srcBuf ); str = dStrlwr( srcBuf );
@ -1825,7 +1827,7 @@ DefineEngineFunction( detag, const char*, ( const char* str ),,
return ""; return "";
char* ret = Con::getReturnBuffer( dStrlen( word + 1 ) + 1 ); char* ret = Con::getReturnBuffer( dStrlen( word + 1 ) + 1 );
dStrcpy( ret, word + 1 ); dStrcpy( ret, word + 1, dStrlen(word + 1) + 1 );
return ret; return ret;
} }
else else
@ -1889,7 +1891,7 @@ ConsoleFunction( echo, void, 2, 0, "( string message... ) "
char *ret = Con::getReturnBuffer(len + 1); char *ret = Con::getReturnBuffer(len + 1);
ret[0] = 0; ret[0] = 0;
for(i = 1; i < argc; i++) for(i = 1; i < argc; i++)
dStrcat(ret, argv[i], len); dStrcat(ret, argv[i], len + 1);
Con::printf("%s", ret); Con::printf("%s", ret);
ret[0] = 0; ret[0] = 0;
@ -1913,7 +1915,7 @@ ConsoleFunction( warn, void, 2, 0, "( string message... ) "
char *ret = Con::getReturnBuffer(len + 1); char *ret = Con::getReturnBuffer(len + 1);
ret[0] = 0; ret[0] = 0;
for(i = 1; i < argc; i++) for(i = 1; i < argc; i++)
dStrcat(ret, argv[i], len); dStrcat(ret, argv[i], len + 1);
Con::warnf(ConsoleLogEntry::General, "%s", ret); Con::warnf(ConsoleLogEntry::General, "%s", ret);
ret[0] = 0; ret[0] = 0;
@ -1937,7 +1939,7 @@ ConsoleFunction( error, void, 2, 0, "( string message... ) "
char *ret = Con::getReturnBuffer(len + 1); char *ret = Con::getReturnBuffer(len + 1);
ret[0] = 0; ret[0] = 0;
for(i = 1; i < argc; i++) for(i = 1; i < argc; i++)
dStrcat(ret, argv[i], len); dStrcat(ret, argv[i], len + 1);
Con::errorf(ConsoleLogEntry::General, "%s", ret); Con::errorf(ConsoleLogEntry::General, "%s", ret);
ret[0] = 0; ret[0] = 0;

10
Engine/source/console/consoleInternal.cpp
View file

@ -125,7 +125,7 @@ StringValue & StringValue::operator=(const char *string)
{ {
S32 len = dStrlen(string); S32 len = dStrlen(string);
if (len < size) if (len < size)
dStrcpy(val, string); dStrcpy(val, string, size);
else else
{ {
size = len; size = len;
@ -569,7 +569,7 @@ void ConsoleValue::setStringValue(const char * value)
type = TypeInternalString; type = TypeInternalString;
bufferLen = newLen; bufferLen = newLen;
dStrcpy(sval, value); dStrcpy(sval, value, newLen);
} }
else else
Con::setData(type, dataPtr, 0, 1, &value, enumTable); Con::setData(type, dataPtr, 0, 1, &value, enumTable);
@ -702,7 +702,7 @@ Dictionary::Entry* Dictionary::addVariable(const char *name,
if (name[0] != '$') if (name[0] != '$')
{ {
scratchBuffer[0] = '$'; scratchBuffer[0] = '$';
dStrcpy(scratchBuffer + 1, name); dStrcpy(scratchBuffer + 1, name, 1023);
name = scratchBuffer; name = scratchBuffer;
} }
@ -1360,7 +1360,7 @@ void Namespace::addScriptCallback(const char *funcName, const char *usage, Conso
static U32 uid = 0; static U32 uid = 0;
char buffer[1024]; char buffer[1024];
char lilBuffer[32]; char lilBuffer[32];
dStrcpy(buffer, funcName); dStrcpy(buffer, funcName, 1024);
dSprintf(lilBuffer, 32, "_%d_cb", uid++); dSprintf(lilBuffer, 32, "_%d_cb", uid++);
dStrcat(buffer, lilBuffer, 1024); dStrcat(buffer, lilBuffer, 1024);
@ -1381,7 +1381,7 @@ void Namespace::markGroup(const char* name, const char* usage)
static U32 uid = 0; static U32 uid = 0;
char buffer[1024]; char buffer[1024];
char lilBuffer[32]; char lilBuffer[32];
dStrcpy(buffer, name); dStrcpy(buffer, name, 1024);
dSprintf(lilBuffer, 32, "_%d", uid++); dSprintf(lilBuffer, 32, "_%d", uid++);
dStrcat(buffer, lilBuffer, 1024); dStrcat(buffer, lilBuffer, 1024);

2
Engine/source/console/consoleObject.cpp
View file

@ -773,7 +773,7 @@ static const char* returnClassList( Vector< AbstractClassRep* >& classes, U32 bu
dQsort( classes.address(), classes.size(), sizeof( AbstractClassRep* ), ACRCompare ); dQsort( classes.address(), classes.size(), sizeof( AbstractClassRep* ), ACRCompare );
char* ret = Con::getReturnBuffer( bufSize ); char* ret = Con::getReturnBuffer( bufSize );
dStrcpy( ret, classes[ 0 ]->getClassName() ); dStrcpy( ret, classes[ 0 ]->getClassName(), bufSize );
for( U32 i = 1; i < classes.size(); i ++ ) for( U32 i = 1; i < classes.size(); i ++ )
{ {
dStrcat( ret, "\t", bufSize ); dStrcat( ret, "\t", bufSize );

4
Engine/source/console/fieldBrushObject.cpp
View file

@ -273,7 +273,7 @@ DefineConsoleMethod(FieldBrushObject, queryFields, const char*, (const char* sim
for ( U32 groupIndex = 0; groupIndex < groupCount; ++groupIndex ) for ( U32 groupIndex = 0; groupIndex < groupCount; ++groupIndex )
{ {
// Copy string element. // Copy string element.
dStrcpy( tempBuf, StringUnit::getUnit( groupList, groupIndex, " \t\n" ) ); dStrcpy( tempBuf, StringUnit::getUnit( groupList, groupIndex, " \t\n" ), 256 );
// Append internal name. // Append internal name.
dStrcat( tempBuf, "_begingroup", 256 ); dStrcat( tempBuf, "_begingroup", 256 );
// Store Group. // Store Group.
@ -416,7 +416,7 @@ void FieldBrushObject::copyFields( SimObject* pSimObject, const char* fieldList
for ( U32 fieldIndex = 0; fieldIndex < fieldCount; ++fieldIndex ) for ( U32 fieldIndex = 0; fieldIndex < fieldCount; ++fieldIndex )
{ {
// Copy string element. // Copy string element.
dStrcpy( tempBuf, StringUnit::getUnit( fieldList, fieldIndex, " \t\n" ) ); dStrcpy( tempBuf, StringUnit::getUnit( fieldList, fieldIndex, " \t\n" ), bufferSizes );
// Store field. // Store field.
fields.push_back( StringTable->insert( tempBuf ) ); fields.push_back( StringTable->insert( tempBuf ) );

16
Engine/source/console/fileSystemFunctions.cpp
View file

@ -495,7 +495,7 @@ DefineEngineFunction(getDirectoryList, String, ( const char* path, S32 depth ),
// Copy the directory names to the buffer. // Copy the directory names to the buffer.
for (S32 i = 0; i < directories.size(); i++) for (S32 i = 0; i < directories.size(); i++)
{ {
dStrcpy(p, directories[i]); dStrcpy(p, directories[i], length - (p - buffer));
p += dStrlen(directories[i]); p += dStrlen(directories[i]);
// Tab separated. // Tab separated.
p[0] = '\t'; p[0] = '\t';
@ -537,7 +537,7 @@ DefineEngineFunction( fileModifiedTime, String, ( const char* fileName ),,
String fileStr = Platform::localTimeToString( lt ); String fileStr = Platform::localTimeToString( lt );
char *buffer = Con::getReturnBuffer( fileStr.size() ); char *buffer = Con::getReturnBuffer( fileStr.size() );
dStrcpy( buffer, fileStr ); dStrcpy( buffer, fileStr, fileStr.size() );
return buffer; return buffer;
} }
@ -560,7 +560,7 @@ DefineEngineFunction( fileCreatedTime, String, ( const char* fileName ),,
String fileStr = Platform::localTimeToString( lt ); String fileStr = Platform::localTimeToString( lt );
char *buffer = Con::getReturnBuffer( fileStr.size() ); char *buffer = Con::getReturnBuffer( fileStr.size() );
dStrcpy( buffer, fileStr ); dStrcpy( buffer, fileStr, fileStr.size() );
return buffer; return buffer;
} }
@ -609,7 +609,7 @@ DefineEngineFunction(fileBase, String, ( const char* fileName ),,
S32 pathLen = dStrlen( fileName ); S32 pathLen = dStrlen( fileName );
FrameTemp<char> szPathCopy( pathLen + 1); FrameTemp<char> szPathCopy( pathLen + 1);
dStrcpy( szPathCopy, fileName ); dStrcpy( szPathCopy, fileName, pathLen + 1 );
forwardslash( szPathCopy ); forwardslash( szPathCopy );
const char *path = dStrrchr(szPathCopy, '/'); const char *path = dStrrchr(szPathCopy, '/');
@ -618,7 +618,7 @@ DefineEngineFunction(fileBase, String, ( const char* fileName ),,
else else
path++; path++;
char *ret = Con::getReturnBuffer(dStrlen(path) + 1); char *ret = Con::getReturnBuffer(dStrlen(path) + 1);
dStrcpy(ret, path); dStrcpy(ret, path, dStrlen(path) + 1);
char *ext = dStrrchr(ret, '.'); char *ext = dStrrchr(ret, '.');
if(ext) if(ext)
*ext = 0; *ext = 0;
@ -635,7 +635,7 @@ DefineEngineFunction(fileName, String, ( const char* fileName ),,
S32 pathLen = dStrlen( fileName ); S32 pathLen = dStrlen( fileName );
FrameTemp<char> szPathCopy( pathLen + 1); FrameTemp<char> szPathCopy( pathLen + 1);
dStrcpy( szPathCopy, fileName ); dStrcpy( szPathCopy, fileName, pathLen + 1 );
forwardslash( szPathCopy ); forwardslash( szPathCopy );
const char *name = dStrrchr(szPathCopy, '/'); const char *name = dStrrchr(szPathCopy, '/');
@ -644,7 +644,7 @@ DefineEngineFunction(fileName, String, ( const char* fileName ),,
else else
name++; name++;
char *ret = Con::getReturnBuffer(dStrlen(name)); char *ret = Con::getReturnBuffer(dStrlen(name));
dStrcpy(ret, name); dStrcpy(ret, name, dStrlen(name));
return ret; return ret;
} }
@ -658,7 +658,7 @@ DefineEngineFunction(filePath, String, ( const char* fileName ),,
S32 pathLen = dStrlen( fileName ); S32 pathLen = dStrlen( fileName );
FrameTemp<char> szPathCopy( pathLen + 1); FrameTemp<char> szPathCopy( pathLen + 1);
dStrcpy( szPathCopy, fileName ); dStrcpy( szPathCopy, fileName, pathLen + 1 );
forwardslash( szPathCopy ); forwardslash( szPathCopy );
const char *path = dStrrchr(szPathCopy, '/'); const char *path = dStrrchr(szPathCopy, '/');

2
Engine/source/console/persistenceManager.cpp
View file

@ -950,7 +950,7 @@ void PersistenceManager::updateToken( const U32 lineNumber, const U32 linePositi
char* postString = ( char* ) dMalloc( postStringLen + 1 ); char* postString = ( char* ) dMalloc( postStringLen + 1 );
if( needQuotes ) if( needQuotes )
postString[ 0 ] = '"'; postString[ 0 ] = '"';
dStrcpy( &postString[ needQuotes ? 1 : 0 ], postStringSrc ); dStrcpy( &postString[ needQuotes ? 1 : 0 ], postStringSrc, postStringLen + (needQuotes ? 0 : 1) );
postString[ postStringLen ] = 0; postString[ postStringLen ] = 0;
// Calculate the length of our new line // Calculate the length of our new line

8
Engine/source/console/scriptFilename.cpp
View file

@ -189,7 +189,7 @@ bool expandToolScriptFilename(char *filename, U32 size, const char *src)
// Relative to script directory // Relative to script directory
if(cbFullPath) if(cbFullPath)
{ {
dStrcpy(varBuf, cbFullPath); dStrcpy(varBuf, cbFullPath, 1024);
slash = dStrrchr(varBuf, '/'); slash = dStrrchr(varBuf, '/');
if(slash) *slash = 0; if(slash) *slash = 0;
@ -219,7 +219,7 @@ bool expandOldScriptFilename(char *filename, U32 size, const char *src)
const StringTableEntry cbName = CodeBlock::getCurrentCodeBlockName(); const StringTableEntry cbName = CodeBlock::getCurrentCodeBlockName();
if (!cbName) if (!cbName)
{ {
dStrcpy(filename, src); dStrcpy(filename, src, size);
return true; return true;
} }
@ -244,7 +244,7 @@ bool expandOldScriptFilename(char *filename, U32 size, const char *src)
*filename = 0; *filename = 0;
return false; return false;
} }
dStrcpy(filename, src); dStrcpy(filename, src, size);
return true; return true;
} }
@ -264,7 +264,7 @@ bool expandOldScriptFilename(char *filename, U32 size, const char *src)
} }
dStrncpy(filename, cbName, length); dStrncpy(filename, cbName, length);
dStrcpy(filename+length, src+1); dStrcpy(filename+length, src+1, size - length);
return true; return true;
} }

4
Engine/source/console/sim.cpp
View file

@ -216,7 +216,7 @@ DefineConsoleFunction( getUniqueName, const char*, (const char * baseName), ,
return NULL; return NULL;
char *buffer = Con::getReturnBuffer( outName.size() ); char *buffer = Con::getReturnBuffer( outName.size() );
dStrcpy( buffer, outName ); dStrcpy( buffer, outName, outName.size() );
return buffer; return buffer;
} }
@ -241,7 +241,7 @@ DefineConsoleFunction( getUniqueInternalName, const char*, (const char * baseNam
return NULL; return NULL;
char *buffer = Con::getReturnBuffer( outName.size() ); char *buffer = Con::getReturnBuffer( outName.size() );
dStrcpy( buffer, outName ); dStrcpy( buffer, outName, outName.size() );
return buffer; return buffer;
} }

4
Engine/source/console/simDatablock.cpp
View file

@ -198,10 +198,10 @@ void SimDataBlock::performSubstitutions(SimDataBlock* dblock, const SimObject* o
} }
char obj_str[32]; char obj_str[32];
dStrcpy(obj_str, Con::getIntArg(obj->getId())); dStrcpy(obj_str, Con::getIntArg(obj->getId()), 32);
char index_str[32]; char index_str[32];
dStrcpy(index_str, Con::getIntArg(index)); dStrcpy(index_str, Con::getIntArg(index), 32);
for (S32 i = 0; i < substitutions.size(); i++) for (S32 i = 0; i < substitutions.size(); i++)
{ {

16
Engine/source/console/simObject.cpp
View file

@ -320,7 +320,7 @@ void SimObject::writeFields(Stream &stream, U32 tabStop)
U32 nBufferSize = dStrlen( val ) + 1; U32 nBufferSize = dStrlen( val ) + 1;
FrameTemp<char> valCopy( nBufferSize ); FrameTemp<char> valCopy( nBufferSize );
dStrcpy( (char *)valCopy, val ); dStrcpy( (char *)valCopy, val, nBufferSize );
if (!writeField(f->pFieldname, valCopy)) if (!writeField(f->pFieldname, valCopy))
continue; continue;
@ -402,12 +402,12 @@ bool SimObject::save(const char *pcFileName, bool bOnlySelected, const char *pre
char docRoot[256]; char docRoot[256];
char modRoot[256]; char modRoot[256];
dStrcpy(docRoot, pcFileName); dStrcpy(docRoot, pcFileName, 256);
char *p = dStrrchr(docRoot, '/'); char *p = dStrrchr(docRoot, '/');
if (p) *++p = '\0'; if (p) *++p = '\0';
else docRoot[0] = '\0'; else docRoot[0] = '\0';
dStrcpy(modRoot, pcFileName); dStrcpy(modRoot, pcFileName, 256);
p = dStrchr(modRoot, '/'); p = dStrchr(modRoot, '/');
if (p) *++p = '\0'; if (p) *++p = '\0';
else modRoot[0] = '\0'; else modRoot[0] = '\0';
@ -1028,7 +1028,7 @@ void SimObject::setDataField(StringTableEntry slotName, const char *array, const
else else
{ {
char buf[256]; char buf[256];
dStrcpy(buf, slotName); dStrcpy(buf, slotName, 256);
dStrcat(buf, array, 256); dStrcat(buf, array, 256);
StringTableEntry permanentSlotName = StringTable->insert(buf); StringTableEntry permanentSlotName = StringTable->insert(buf);
mFieldDictionary->setFieldValue(permanentSlotName, value); mFieldDictionary->setFieldValue(permanentSlotName, value);
@ -1069,7 +1069,7 @@ const char *SimObject::getDataField(StringTableEntry slotName, const char *array
else else
{ {
static char buf[256]; static char buf[256];
dStrcpy(buf, slotName); dStrcpy(buf, slotName, 256);
dStrcat(buf, array, 256); dStrcat(buf, array, 256);
if (const char* val = mFieldDictionary->getFieldValue(StringTable->insert(buf))) if (const char* val = mFieldDictionary->getFieldValue(StringTable->insert(buf)))
return val; return val;
@ -1310,7 +1310,7 @@ U32 SimObject::getDataFieldType( StringTableEntry slotName, const char* array )
else else
{ {
static char buf[256]; static char buf[256];
dStrcpy( buf, slotName ); dStrcpy( buf, slotName, 256 );
dStrcat( buf, array, 256 ); dStrcat( buf, array, 256 );
return mFieldDictionary->getFieldType( StringTable->insert( buf ) ); return mFieldDictionary->getFieldType( StringTable->insert( buf ) );
@ -1333,7 +1333,7 @@ void SimObject::setDataFieldType(const U32 fieldTypeId, StringTableEntry slotNam
else else
{ {
static char buf[256]; static char buf[256];
dStrcpy( buf, slotName ); dStrcpy( buf, slotName, 256 );
dStrcat( buf, array, 256 ); dStrcat( buf, array, 256 );
mFieldDictionary->setFieldType( StringTable->insert( buf ), fieldTypeId ); mFieldDictionary->setFieldType( StringTable->insert( buf ), fieldTypeId );
@ -1354,7 +1354,7 @@ void SimObject::setDataFieldType(const char *typeName, StringTableEntry slotName
else else
{ {
static char buf[256]; static char buf[256];
dStrcpy( buf, slotName ); dStrcpy( buf, slotName, 256 );
dStrcat( buf, array, 256 ); dStrcat( buf, array, 256 );
StringTableEntry permanentSlotName = StringTable->insert(buf); StringTableEntry permanentSlotName = StringTable->insert(buf);

2
Engine/source/console/simObjectMemento.cpp
View file

@ -137,7 +137,7 @@ SimObject *SimObjectMemento::restore() const
tempBuffer = ( char* ) dMalloc( dStrlen( mState ) + uniqueNameLen + 1 ); tempBuffer = ( char* ) dMalloc( dStrlen( mState ) + uniqueNameLen + 1 );
dMemcpy( tempBuffer, mState, numCharsToLeftParen ); dMemcpy( tempBuffer, mState, numCharsToLeftParen );
dMemcpy( &tempBuffer[ numCharsToLeftParen ], uniqueName, uniqueNameLen ); dMemcpy( &tempBuffer[ numCharsToLeftParen ], uniqueName, uniqueNameLen );
dStrcpy( &tempBuffer[ numCharsToLeftParen + uniqueNameLen ], &mState[ numCharsToLeftParen ] ); dStrcpy( &tempBuffer[ numCharsToLeftParen + uniqueNameLen ], &mState[ numCharsToLeftParen ], dStrlen(mState) - numCharsToLeftParen + 1 );
} }
Con::evaluate( tempBuffer ); Con::evaluate( tempBuffer );

2
Engine/source/console/stringStack.h
View file

@ -176,7 +176,7 @@ struct StringStack
mLen = dStrlen(s); mLen = dStrlen(s);
validateBufferSize(mStart + mLen + 2); validateBufferSize(mStart + mLen + 2);
dStrcpy(mBuffer + mStart, s); dStrcpy(mBuffer + mStart, s, mBufferSize - mStart);
} }
/// Get the top of the stack, as a StringTableEntry. /// Get the top of the stack, as a StringTableEntry.

4
Engine/source/core/stream/bitStream.cpp
View file

@ -668,13 +668,13 @@ void BitStream::readString(char buf[256])
{ {
S32 offset = readInt(8); S32 offset = readInt(8);
HuffmanProcessor::g_huffProcessor.readHuffBuffer(this, stringBuffer + offset); HuffmanProcessor::g_huffProcessor.readHuffBuffer(this, stringBuffer + offset);
dStrcpy(buf, stringBuffer); dStrcpy(buf, stringBuffer, 256);
return; return;
} }
} }
HuffmanProcessor::g_huffProcessor.readHuffBuffer(this, buf); HuffmanProcessor::g_huffProcessor.readHuffBuffer(this, buf);
if(stringBuffer) if(stringBuffer)
dStrcpy(stringBuffer, buf); dStrcpy(stringBuffer, buf, 256);
} }
void BitStream::writeString(const char *string, S32 maxLen) void BitStream::writeString(const char *string, S32 maxLen)

2
Engine/source/core/stringTable.cpp
View file

@ -145,7 +145,7 @@ StringTableEntry _StringTable::insert(const char* _val, const bool caseSens)
*walk = (Node *) mempool.alloc(sizeof(Node)); *walk = (Node *) mempool.alloc(sizeof(Node));
(*walk)->next = 0; (*walk)->next = 0;
(*walk)->val = (char *) mempool.alloc(dStrlen(val) + 1); (*walk)->val = (char *) mempool.alloc(dStrlen(val) + 1);
dStrcpy((*walk)->val, val); dStrcpy((*walk)->val, val, dStrlen(val) + 1);
ret = (*walk)->val; ret = (*walk)->val;
itemCount ++; itemCount ++;
} }

6
Engine/source/core/strings/findMatch.cpp
View file

@ -72,7 +72,7 @@ void FindMatch::setExpression( const char *_expression )
delete [] expression; delete [] expression;
expression = new char[dStrlen(_expression) + 1]; expression = new char[dStrlen(_expression) + 1];
dStrcpy(expression, _expression); dStrcpy(expression, _expression, dStrlen(_expression) + 1);
dStrupr(expression); dStrupr(expression);
} }
@ -82,7 +82,7 @@ bool FindMatch::findMatch( const char *str, bool caseSensitive )
return false; return false;
char nstr[512]; char nstr[512];
dStrcpy( nstr,str ); dStrcpy( nstr,str,512 );
dStrupr(nstr); dStrupr(nstr);
if ( isMatch( expression, nstr, caseSensitive ) ) if ( isMatch( expression, nstr, caseSensitive ) )
{ {
@ -143,7 +143,7 @@ bool FindMatch::isMatchMultipleExprs( const char *exps, const char *str, bool ca
S32 len = dStrlen(exps); S32 len = dStrlen(exps);
char *e = new char[len+1]; char *e = new char[len+1];
dStrcpy(e,exps); dStrcpy(e,exps,len+1);
// [tom, 12/18/2006] This no longer supports space separated expressions as // [tom, 12/18/2006] This no longer supports space separated expressions as
// they don't work when the paths have spaces in. // they don't work when the paths have spaces in.

2
Engine/source/core/strings/stringFunctions.cpp
View file

@ -216,7 +216,7 @@ S32 dStrnatcasecmp(const nat_char* a, const nat_char* b) {
char *dStrdup_r(const char *src, const char *fileName, dsize_t lineNumber) char *dStrdup_r(const char *src, const char *fileName, dsize_t lineNumber)
{ {
char *buffer = (char *) dMalloc_r(dStrlen(src) + 1, fileName, lineNumber); char *buffer = (char *) dMalloc_r(dStrlen(src) + 1, fileName, lineNumber);
dStrcpy(buffer, src); dStrcpy(buffer, src, dStrlen(src) + 1);
return buffer; return buffer;
} }

19
Engine/source/core/strings/stringFunctions.h
View file

@ -47,6 +47,7 @@
#endif // defined(TORQUE_OS_WIN) #endif // defined(TORQUE_OS_WIN)
#define DEBUG_CHECK_OVERFLOW 1
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// standard string functions [defined in platformString.cpp] // standard string functions [defined in platformString.cpp]
@ -60,12 +61,16 @@ inline char *dStrcat(char *dst, const char *src)
inline char *dStrcat(char *dst, const char *src, dsize_t len) inline char *dStrcat(char *dst, const char *src, dsize_t len)
{ {
#ifdef DEBUG_CHECK_OVERFLOW
if (strlen(src) >= len) {
AssertWarn(false, "dStrcat out of range");
}
#endif
return strncat(dst,src,len - 1); //Safety because strncat copies at most len+1 characters return strncat(dst,src,len - 1); //Safety because strncat copies at most len+1 characters
} }
inline char *dStrncat(char *dst, const char *src, dsize_t len) inline char *dStrncat(char *dst, const char *src, dsize_t len)
{ {
AssertFatal(false, "Use dStrcat with length");
return dStrcat(dst, src, len); return dStrcat(dst, src, len);
} }
@ -94,9 +99,21 @@ inline S32 dStrnicmp(const char *str1, const char *str2, dsize_t len)
return strncasecmp( str1, str2, len ); return strncasecmp( str1, str2, len );
} }
/// @deprecated Use strcpy(char *, const char *, dsize_t) instead
inline char *dStrcpy(char *dst, const char *src) inline char *dStrcpy(char *dst, const char *src)
{ {
AssertFatal(false, "dStrcpy without length is deprecated");
return strcpy(dst,src); return strcpy(dst,src);
}
inline char *dStrcpy(char *dst, const char *src, dsize_t len)
{
#ifdef DEBUG_CHECK_OVERFLOW
if (strlen(src) >= len) {
AssertWarn(false, "dStrcpy out of range");
}
#endif
return strncpy(dst,src,len);
} }
inline char *dStrncpy(char *dst, const char *src, dsize_t len) inline char *dStrncpy(char *dst, const char *src, dsize_t len)

6
Engine/source/core/tokenizer.cpp
View file

@ -61,7 +61,7 @@ bool Tokenizer::openFile(const char* pFileName)
delete pStream; delete pStream;
return false; return false;
} }
dStrcpy(mFileName, pFileName); dStrcpy(mFileName, pFileName, 1024);
mBufferSize = pStream->getStreamSize(); mBufferSize = pStream->getStreamSize();
mpBuffer = new char[mBufferSize]; mpBuffer = new char[mBufferSize];
@ -99,7 +99,7 @@ void Tokenizer::setBuffer(const char* buffer, U32 bufferSize)
mBufferSize = bufferSize; mBufferSize = bufferSize;
mpBuffer = new char[mBufferSize + 1]; mpBuffer = new char[mBufferSize + 1];
dStrcpy(mpBuffer, buffer); dStrcpy(mpBuffer, buffer, mBufferSize + 1);
reset(); reset();
@ -634,4 +634,4 @@ bool Tokenizer::endOfFile()
return false; return false;
else else
return true; return true;
} }

2
Engine/source/core/util/zip/centralDir.cpp
View file

@ -178,7 +178,7 @@ void CentralDir::setFileComment(const char *comment)
{ {
SAFE_DELETE_ARRAY(mFileComment); SAFE_DELETE_ARRAY(mFileComment);
mFileComment = new char [dStrlen(comment)+1]; mFileComment = new char [dStrlen(comment)+1];
dStrcpy(mFileComment, comment); dStrcpy(mFileComment, comment, dStrlen(comment)+1);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
Engine/source/gfx/Null/gfxNullDevice.cpp
View file

@ -309,7 +309,7 @@ void GFXNullDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
vm.resolution.set(800,600); vm.resolution.set(800,600);
toAdd->mAvailableModes.push_back(vm); toAdd->mAvailableModes.push_back(vm);
dStrcpy(toAdd->mName, "GFX Null Device"); dStrcpy(toAdd->mName, "GFX Null Device", GFXAdapter::MaxAdapterNameLen);
adapterList.push_back(toAdd); adapterList.push_back(toAdd);
} }
@ -342,4 +342,4 @@ public:
} }
}; };
static GFXNullRegisterDevice pNullRegisterDevice; static GFXNullRegisterDevice pNullRegisterDevice;

4
Engine/source/gfx/gfxStructs.cpp
View file

@ -40,7 +40,7 @@ void GFXVideoMode::parseFromString( const char *str )
// Copy the string, as dStrtok is destructive // Copy the string, as dStrtok is destructive
char *tempBuf = new char[dStrlen( str ) + 1]; char *tempBuf = new char[dStrlen( str ) + 1];
dStrcpy( tempBuf, str ); dStrcpy( tempBuf, str, dStrlen(str) + 1 );
#define PARSE_ELEM(type, var, func, tokParam, sep) \ #define PARSE_ELEM(type, var, func, tokParam, sep) \
if(const char *ptr = dStrtok( tokParam, sep)) \ if(const char *ptr = dStrtok( tokParam, sep)) \
@ -76,4 +76,4 @@ void GFXShaderMacro::stringize( const Vector<GFXShaderMacro> &macros, String *ou
} }
(*outString) += ";"; (*outString) += ";";
} }
} }

4
Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp
View file

@ -128,11 +128,11 @@ void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
if (renderer) if (renderer)
{ {
dStrcpy(toAdd->mName, renderer); dStrcpy(toAdd->mName, renderer, GFXAdapter::MaxAdapterNameLen);
dStrcat(toAdd->mName, " OpenGL", GFXAdapter::MaxAdapterNameLen); dStrcat(toAdd->mName, " OpenGL", GFXAdapter::MaxAdapterNameLen);
} }
else else
dStrcpy(toAdd->mName, "OpenGL"); dStrcpy(toAdd->mName, "OpenGL", GFXAdapter::MaxAdapterNameLen);
toAdd->mType = OpenGL; toAdd->mType = OpenGL;
toAdd->mShaderModel = 0.f; toAdd->mShaderModel = 0.f;

4
Engine/source/gfx/gl/win32/gfxGLDevice.win.cpp
View file

@ -129,11 +129,11 @@ void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
if (renderer) if (renderer)
{ {
dStrcpy(toAdd->mName, renderer); dStrcpy(toAdd->mName, renderer, GFXAdapter::MaxAdapterNameLen);
dStrncat(toAdd->mName, " OpenGL", GFXAdapter::MaxAdapterNameLen); dStrncat(toAdd->mName, " OpenGL", GFXAdapter::MaxAdapterNameLen);
} }
else else
dStrcpy(toAdd->mName, "OpenGL"); dStrcpy(toAdd->mName, "OpenGL", GFXAdapter::MaxAdapterNameLen);
toAdd->mType = OpenGL; toAdd->mType = OpenGL;
toAdd->mShaderModel = 0.f; toAdd->mShaderModel = 0.f;

2
Engine/source/gfx/screenshot.cpp
View file

@ -55,7 +55,7 @@ ScreenShot::ScreenShot()
void ScreenShot::setPending( const char *filename, bool writeJPG, S32 tiles, F32 overlap ) void ScreenShot::setPending( const char *filename, bool writeJPG, S32 tiles, F32 overlap )
{ {
dStrcpy( mFilename, filename ); dStrcpy( mFilename, filename, 256 );
mWriteJPG = writeJPG; mWriteJPG = writeJPG;
mTiles = getMax( tiles, 1 ); mTiles = getMax( tiles, 1 );
mPixelOverlap.set(getMin(overlap, 0.25f), getMin(overlap, 0.25f)); mPixelOverlap.set(getMin(overlap, 0.25f), getMin(overlap, 0.25f));

2
Engine/source/gui/containers/guiFormCtrl.cpp
View file

@ -218,7 +218,7 @@ bool GuiFormCtrl::resize(const Point2I &newPosition, const Point2I &newExtent)
S32 strlen = dStrlen((const char*)mCaption); S32 strlen = dStrlen((const char*)mCaption);
for(S32 i=strlen; i>=0; --i) for(S32 i=strlen; i>=0; --i)
{ {
dStrcpy(buf, ""); dStrcpy(buf, "", i);
dStrcat(buf, (const char*)mCaption, i); dStrcat(buf, (const char*)mCaption, i);
dStrcat(buf, "...", i); dStrcat(buf, "...", i);

4
Engine/source/gui/controls/guiAnimBitmapCtrl.cpp
View file

@ -168,7 +168,7 @@ bool guiAnimBitmapCtrl::ptSetFrameRanges(void *object, const char *index, const
return true; return true;
} }
char* tokCopy = new char[dStrlen(data) + 1]; char* tokCopy = new char[dStrlen(data) + 1];
dStrcpy(tokCopy, data); dStrcpy(tokCopy, data, dStrlen(data) + 1);
char* currTok = dStrtok(tokCopy, " \t"); char* currTok = dStrtok(tokCopy, " \t");
while (currTok != NULL) while (currTok != NULL)
@ -291,4 +291,4 @@ void guiAnimBitmapCtrl::onRender(Point2I offset, const RectI &updateRect)
} }
renderChildControls(offset, updateRect); renderChildControls(offset, updateRect);
} }

2
Engine/source/gui/controls/guiFileTreeCtrl.cpp
View file

@ -276,7 +276,7 @@ void GuiFileTreeCtrl::recurseInsert( Item* parent, StringTableEntry path )
char szPathCopy [ 1024 ]; char szPathCopy [ 1024 ];
dMemset( szPathCopy, 0, 1024 ); dMemset( szPathCopy, 0, 1024 );
dStrcpy( szPathCopy, path ); dStrcpy( szPathCopy, path, 1024 );
// Jump over the first character if it's a root / // Jump over the first character if it's a root /
char *curPos = szPathCopy; char *curPos = szPathCopy;

9
Engine/source/gui/controls/guiPopUpCtrl.cpp
View file

@ -566,13 +566,14 @@ void GuiPopUpMenuCtrl::setBitmap( const char *name )
{ {
char buffer[1024]; char buffer[1024];
char *p; char *p;
dStrcpy(buffer, name); dStrcpy(buffer, name, 1024);
p = buffer + dStrlen(buffer); p = buffer + dStrlen(buffer);
S32 pLen = 1024 - dStrlen(buffer);
dStrcpy(p, "_n"); dStrcpy(p, "_n", pLen);
mTextureNormal = GFXTexHandle( (StringTableEntry)buffer, &GFXDefaultGUIProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__) ); mTextureNormal = GFXTexHandle( (StringTableEntry)buffer, &GFXDefaultGUIProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__) );
dStrcpy(p, "_d"); dStrcpy(p, "_d", pLen);
mTextureDepressed = GFXTexHandle( (StringTableEntry)buffer, &GFXDefaultGUIProfile, avar("%s() - mTextureDepressed (line %d)", __FUNCTION__, __LINE__) ); mTextureDepressed = GFXTexHandle( (StringTableEntry)buffer, &GFXDefaultGUIProfile, avar("%s() - mTextureDepressed (line %d)", __FUNCTION__, __LINE__) );
if ( !mTextureDepressed ) if ( !mTextureDepressed )
mTextureDepressed = mTextureNormal; mTextureDepressed = mTextureNormal;
@ -637,7 +638,7 @@ void GuiPopUpMenuCtrl::addEntry( const char *buf, S32 id, U32 scheme )
mIdMax = id; mIdMax = id;
Entry e; Entry e;
dStrcpy( e.buf, buf ); dStrcpy( e.buf, buf, 256 );
e.id = id; e.id = id;
e.scheme = scheme; e.scheme = scheme;

9
Engine/source/gui/controls/guiPopUpCtrlEx.cpp
View file

@ -771,13 +771,14 @@ void GuiPopUpMenuCtrlEx::setBitmap(const char *name)
{ {
char buffer[1024]; char buffer[1024];
char *p; char *p;
dStrcpy(buffer, name); dStrcpy(buffer, name, 1024);
p = buffer + dStrlen(buffer); p = buffer + dStrlen(buffer);
S32 pLen = 1024 - dStrlen(buffer);
dStrcpy(p, "_n"); dStrcpy(p, "_n", pLen);
mTextureNormal = GFXTexHandle( (StringTableEntry)buffer, &GFXDefaultGUIProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__) ); mTextureNormal = GFXTexHandle( (StringTableEntry)buffer, &GFXDefaultGUIProfile, avar("%s() - mTextureNormal (line %d)", __FUNCTION__, __LINE__) );
dStrcpy(p, "_d"); dStrcpy(p, "_d", pLen);
mTextureDepressed = GFXTexHandle( (StringTableEntry)buffer, &GFXDefaultGUIProfile, avar("%s() - mTextureDepressed (line %d)", __FUNCTION__, __LINE__) ); mTextureDepressed = GFXTexHandle( (StringTableEntry)buffer, &GFXDefaultGUIProfile, avar("%s() - mTextureDepressed (line %d)", __FUNCTION__, __LINE__) );
if ( !mTextureDepressed ) if ( !mTextureDepressed )
mTextureDepressed = mTextureNormal; mTextureDepressed = mTextureNormal;
@ -840,7 +841,7 @@ void GuiPopUpMenuCtrlEx::addEntry(const char *buf, S32 id, U32 scheme)
mIdMax = id; mIdMax = id;
Entry e; Entry e;
dStrcpy( e.buf, buf ); dStrcpy( e.buf, buf, 256 );
e.id = id; e.id = id;
e.scheme = scheme; e.scheme = scheme;

2
Engine/source/gui/controls/guiTabPageCtrl.cpp
View file

@ -50,7 +50,7 @@ GuiTabPageCtrl::GuiTabPageCtrl(void)
{ {
setExtent(Point2I(100, 200)); setExtent(Point2I(100, 200));
mFitBook = false; mFitBook = false;
dStrcpy(mText,(UTF8*)"TabPage"); dStrcpy(mText,(UTF8*)"TabPage", MAX_STRING_LENGTH);
mActive = true; mActive = true;
mIsContainer = true; mIsContainer = true;
} }

8
Engine/source/gui/controls/guiTreeViewCtrl.cpp
View file

@ -4754,15 +4754,15 @@ StringTableEntry GuiTreeViewCtrl::getTextToRoot( S32 itemId, const char * delimi
dMemset( bufferOne, 0, sizeof(bufferOne) ); dMemset( bufferOne, 0, sizeof(bufferOne) );
dMemset( bufferTwo, 0, sizeof(bufferTwo) ); dMemset( bufferTwo, 0, sizeof(bufferTwo) );
dStrcpy( bufferOne, item->getText() ); dStrcpy( bufferOne, item->getText(), 1024 );
Item *prevNode = item->mParent; Item *prevNode = item->mParent;
while ( prevNode ) while ( prevNode )
{ {
dMemset( bufferNodeText, 0, sizeof(bufferNodeText) ); dMemset( bufferNodeText, 0, sizeof(bufferNodeText) );
dStrcpy( bufferNodeText, prevNode->getText() ); dStrcpy( bufferNodeText, prevNode->getText(), 128 );
dSprintf( bufferTwo, 1024, "%s%s%s",bufferNodeText, delimiter, bufferOne ); dSprintf( bufferTwo, 1024, "%s%s%s",bufferNodeText, delimiter, bufferOne );
dStrcpy( bufferOne, bufferTwo ); dStrcpy( bufferOne, bufferTwo, 1024 );
dMemset( bufferTwo, 0, sizeof(bufferTwo) ); dMemset( bufferTwo, 0, sizeof(bufferTwo) );
prevNode = prevNode->mParent; prevNode = prevNode->mParent;
} }
@ -5570,4 +5570,4 @@ DefineEngineMethod(GuiTreeViewCtrl, getItemAtPosition, S32, (Point2I position),
"@return The id of the item under the position.") "@return The id of the item under the position.")
{ {
return object->getItemAtPosition(position); return object->getItemAtPosition(position);
} }

2
Engine/source/gui/core/guiControl.cpp
View file

@ -2570,7 +2570,7 @@ DefineEngineMethod( GuiControl, findHitControls, const char*, ( S32 x, S32 y, S3
return ""; return "";
char* buffer = Con::getReturnBuffer( s.size() ); char* buffer = Con::getReturnBuffer( s.size() );
dStrcpy( buffer, s.c_str() ); dStrcpy( buffer, s.c_str(), s.size() );
return buffer; return buffer;
} }

6
Engine/source/gui/editor/guiDebugger.cpp
View file

@ -431,7 +431,7 @@ bool DbgFileView::findMouseOverVariable()
{ {
S32 stringPosition = pt.x - gFileXOffset; S32 stringPosition = pt.x - gFileXOffset;
char tempBuf[256], *varNamePtr = &tempBuf[1]; char tempBuf[256], *varNamePtr = &tempBuf[1];
dStrcpy(tempBuf, mFileView[cell.y].text); dStrcpy(tempBuf, mFileView[cell.y].text, 256);
//find the current mouse over char //find the current mouse over char
S32 charNum = findMouseOverChar(mFileView[cell.y].text, stringPosition); S32 charNum = findMouseOverChar(mFileView[cell.y].text, stringPosition);
@ -526,7 +526,7 @@ void DbgFileView::onPreRender()
{ {
setUpdate(); setUpdate();
char oldVar[256]; char oldVar[256];
dStrcpy(oldVar, mMouseOverVariable); dStrcpy(oldVar, mMouseOverVariable, 256);
bool found = findMouseOverVariable(); bool found = findMouseOverVariable();
if (found && mPCCurrentLine >= 0) if (found && mPCCurrentLine >= 0)
{ {
@ -685,7 +685,7 @@ void DbgFileView::onRenderCell(Point2I offset, Point2I cell, bool selected, bool
{ {
S32 startPos, endPos; S32 startPos, endPos;
char tempBuf[256]; char tempBuf[256];
dStrcpy(tempBuf, mFileView[cell.y].text); dStrcpy(tempBuf, mFileView[cell.y].text, 256);
//get the end coord //get the end coord
tempBuf[mBlockEnd] = '\0'; tempBuf[mBlockEnd] = '\0';

2
Engine/source/gui/editor/guiEditCtrl.cpp
View file

@ -2626,7 +2626,7 @@ DefineConsoleMethod( GuiEditCtrl, getSelectionGlobalBounds, const char*, (), , "
String str = String::ToString( "%i %i %i %i", bounds.point.x, bounds.point.y, bounds.extent.x, bounds.extent.y ); String str = String::ToString( "%i %i %i %i", bounds.point.x, bounds.point.y, bounds.extent.x, bounds.extent.y );
char* buffer = Con::getReturnBuffer( str.length() ); char* buffer = Con::getReturnBuffer( str.length() );
dStrcpy( buffer, str.c_str() ); dStrcpy( buffer, str.c_str(), str.length() );
return buffer; return buffer;
} }

2
Engine/source/gui/editor/guiFilterCtrl.cpp
View file

@ -239,7 +239,7 @@ void Filter::set(S32 argc, const char *argv[])
if (argc == 1) if (argc == 1)
{ // in the form of one string "1.0 1.0 1.0" { // in the form of one string "1.0 1.0 1.0"
char list[1024]; char list[1024];
dStrcpy(list, *argv); // strtok modifies the string so we need to copy it dStrcpy(list, *argv, 1024); // strtok modifies the string so we need to copy it
char *value = dStrtok(list, " "); char *value = dStrtok(list, " ");
while (value) while (value)
{ {

2
Engine/source/gui/utility/messageVector.cpp
View file

@ -500,7 +500,7 @@ void MessageVector::insertLine(const U32 position,
U32 len = dStrlen(newMessage) + 1; U32 len = dStrlen(newMessage) + 1;
char* copy = new char[len]; char* copy = new char[len];
dStrcpy(copy, newMessage); dStrcpy(copy, newMessage, len);
mMessageLines.insert(position); mMessageLines.insert(position);
mMessageLines[position].message = copy; mMessageLines[position].message = copy;

18
Engine/source/i18n/lang.cpp
View file

@ -43,7 +43,7 @@ LangFile::LangFile(const UTF8 *langName /* = NULL */)
if(langName) if(langName)
{ {
mLangName = new UTF8 [dStrlen(langName) + 1]; mLangName = new UTF8 [dStrlen(langName) + 1];
dStrcpy(mLangName, langName); dStrcpy(mLangName, langName, dStrlen(langName) + 1);
} }
else else
mLangName = NULL; mLangName = NULL;
@ -137,7 +137,7 @@ const UTF8 * LangFile::getString(U32 id)
U32 LangFile::addString(const UTF8 *str) U32 LangFile::addString(const UTF8 *str)
{ {
UTF8 *newstr = new UTF8 [dStrlen(str) + 1]; UTF8 *newstr = new UTF8 [dStrlen(str) + 1];
dStrcpy(newstr, str); dStrcpy(newstr, str, dStrlen(str) + 1);
mStringTable.push_back(newstr); mStringTable.push_back(newstr);
return mStringTable.size() - 1; return mStringTable.size() - 1;
} }
@ -157,7 +157,7 @@ void LangFile::setString(U32 id, const UTF8 *str)
SAFE_DELETE_ARRAY(mStringTable[id]); SAFE_DELETE_ARRAY(mStringTable[id]);
UTF8 *newstr = new UTF8 [dStrlen(str) + 1]; UTF8 *newstr = new UTF8 [dStrlen(str) + 1];
dStrcpy(newstr, str); dStrcpy(newstr, str, dStrlen(str) + 1);
mStringTable[id] = newstr; mStringTable[id] = newstr;
} }
@ -167,7 +167,7 @@ void LangFile::setLangName(const UTF8 *newName)
delete [] mLangName; delete [] mLangName;
mLangName = new UTF8 [dStrlen(newName) + 1]; mLangName = new UTF8 [dStrlen(newName) + 1];
dStrcpy(mLangName, newName); dStrcpy(mLangName, newName, dStrlen(newName) + 1);
} }
void LangFile::setLangFile(const UTF8 *langFile) void LangFile::setLangFile(const UTF8 *langFile)
@ -176,7 +176,7 @@ void LangFile::setLangFile(const UTF8 *langFile)
delete [] mLangFile; delete [] mLangFile;
mLangFile = new UTF8 [dStrlen(langFile) + 1]; mLangFile = new UTF8 [dStrlen(langFile) + 1];
dStrcpy(mLangFile, langFile); dStrcpy(mLangFile, langFile, dStrlen(langFile) + 1);
} }
bool LangFile::activateLanguage() bool LangFile::activateLanguage()
@ -350,7 +350,7 @@ DefineConsoleMethod(LangTable, getString, const char *, (U32 id), ,
if(str != NULL) if(str != NULL)
{ {
char * ret = Con::getReturnBuffer(dStrlen(str) + 1); char * ret = Con::getReturnBuffer(dStrlen(str) + 1);
dStrcpy(ret, str); dStrcpy(ret, str, dStrlen(str) + 1);
return ret; return ret;
} }
@ -388,7 +388,7 @@ DefineConsoleMethod(LangTable, getLangName, const char *, (S32 langId), , "(int
if(str != NULL) if(str != NULL)
{ {
char * ret = Con::getReturnBuffer(dStrlen(str) + 1); char * ret = Con::getReturnBuffer(dStrlen(str) + 1);
dStrcpy(ret, str); dStrcpy(ret, str, dStrlen(str) + 1);
return ret; return ret;
} }
@ -414,7 +414,7 @@ UTF8 *sanitiseVarName(const UTF8 *varName, UTF8 *buffer, U32 bufsize)
return NULL; return NULL;
} }
dStrcpy(buffer, (const UTF8*)"I18N::"); dStrcpy(buffer, (const UTF8*)"I18N::", bufsize);
UTF8 *dptr = buffer + 6; UTF8 *dptr = buffer + 6;
const UTF8 *sptr = varName; const UTF8 *sptr = varName;
@ -575,4 +575,4 @@ ConsoleFunction(CompileLanguage, void, 2, 3, "(string inputFile, [bool createMap
delete mapStream; delete mapStream;
} }
} }
//end lang_ localization //end lang_ localization

10
Engine/source/materials/materialDefinition.cpp
View file

@ -654,33 +654,33 @@ DefineConsoleMethod( Material, getAnimFlags, const char*, (U32 id), , "" )
if(object->mAnimFlags[ id ] & Material::Scroll) if(object->mAnimFlags[ id ] & Material::Scroll)
{ {
if(dStrcmp( animFlags, "" ) == 0) if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Scroll" ); dStrcpy( animFlags, "$Scroll", 512 );
} }
if(object->mAnimFlags[ id ] & Material::Rotate) if(object->mAnimFlags[ id ] & Material::Rotate)
{ {
if(dStrcmp( animFlags, "" ) == 0) if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Rotate" ); dStrcpy( animFlags, "$Rotate", 512 );
else else
dStrcat( animFlags, " | $Rotate", 512); dStrcat( animFlags, " | $Rotate", 512);
} }
if(object->mAnimFlags[ id ] & Material::Wave) if(object->mAnimFlags[ id ] & Material::Wave)
{ {
if(dStrcmp( animFlags, "" ) == 0) if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Wave" ); dStrcpy( animFlags, "$Wave", 512 );
else else
dStrcat( animFlags, " | $Wave", 512); dStrcat( animFlags, " | $Wave", 512);
} }
if(object->mAnimFlags[ id ] & Material::Scale) if(object->mAnimFlags[ id ] & Material::Scale)
{ {
if(dStrcmp( animFlags, "" ) == 0) if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Scale" ); dStrcpy( animFlags, "$Scale", 512 );
else else
dStrcat( animFlags, " | $Scale", 512); dStrcat( animFlags, " | $Scale", 512);
} }
if(object->mAnimFlags[ id ] & Material::Sequence) if(object->mAnimFlags[ id ] & Material::Sequence)
{ {
if(dStrcmp( animFlags, "" ) == 0) if(dStrcmp( animFlags, "" ) == 0)
dStrcpy( animFlags, "$Sequence" ); dStrcpy( animFlags, "$Sequence", 512 );
else else
dStrcat( animFlags, " | $Sequence", 512); dStrcat( animFlags, " | $Sequence", 512);
} }

6
Engine/source/module/moduleDefinition.h
View file

@ -254,11 +254,11 @@ protected:
for ( U32 dependencyIndex = 0; dependencyIndex < dependencyWordCount; ++dependencyIndex ) for ( U32 dependencyIndex = 0; dependencyIndex < dependencyWordCount; ++dependencyIndex )
{ {
// Fetch slot. // Fetch slot.
dStrcpy( slotUnit, StringUnit::getUnit( pDependencyValue, dependencyIndex, "," ) ); dStrcpy( slotUnit, StringUnit::getUnit( pDependencyValue, dependencyIndex, "," ), 256 );
// Fetch slot name and value. // Fetch slot name and value.
dStrcpy( slotName, StringUnit::getUnit( slotUnit, 0, "=" ) ); dStrcpy( slotName, StringUnit::getUnit( slotUnit, 0, "=" ), 256 );
dStrcpy( slotValue, StringUnit::getUnit( slotUnit, 1, "=" ) ); dStrcpy( slotValue, StringUnit::getUnit( slotUnit, 1, "=" ), 256 );
// Fetch module Id. // Fetch module Id.
StringTableEntry moduleId = StringTable->insert( slotName ); StringTableEntry moduleId = StringTable->insert( slotName );

4
Engine/source/module/moduleManager.cpp
View file

@ -74,7 +74,7 @@ ModuleManager::ModuleManager() :
mIgnoreLoadedGroups(false) mIgnoreLoadedGroups(false)
{ {
// Set module extension. // Set module extension.
dStrcpy( mModuleExtension, MODULE_MANAGER_MODULE_DEFINITION_EXTENSION ); dStrcpy( mModuleExtension, MODULE_MANAGER_MODULE_DEFINITION_EXTENSION, 256 );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -155,7 +155,7 @@ bool ModuleManager::setModuleExtension( const char* pExtension )
} }
// Set module extension. // Set module extension.
dStrcpy( mModuleExtension, pExtension ); dStrcpy( mModuleExtension, pExtension, 256 );
return true; return true;
} }

4
Engine/source/persistence/taml/taml.cpp
View file

@ -708,7 +708,7 @@ ImplementEnumType(_TamlFormatMode,
U32 nBufferSize = dStrlen(pFieldValue) + 1; U32 nBufferSize = dStrlen(pFieldValue) + 1;
FrameTemp<char> valueCopy(nBufferSize); FrameTemp<char> valueCopy(nBufferSize);
dStrcpy((char *)valueCopy, pFieldValue); dStrcpy((char *)valueCopy, pFieldValue, nBufferSize);
// Skip if field should not be written. // Skip if field should not be written.
if (!pSimObject->writeField(fieldName, valueCopy)) if (!pSimObject->writeField(fieldName, valueCopy))
@ -1547,4 +1547,4 @@ ImplementEnumType(_TamlFormatMode,
TiXmlElement* pAnyElement = new TiXmlElement("xs:any"); TiXmlElement* pAnyElement = new TiXmlElement("xs:any");
pAnyElement->SetAttribute("processContents", "skip"); pAnyElement->SetAttribute("processContents", "skip");
pSequenceElement->LinkEndChild(pAnyElement); pSequenceElement->LinkEndChild(pAnyElement);
} }

2
Engine/source/persistence/taml/tamlCustom.cpp
View file

@ -53,7 +53,7 @@ void TamlCustomField::set( const char* pFieldName, const char* pFieldValue )
} }
#endif #endif
// Copy field value. // Copy field value.
dStrcpy( mFieldValue, pFieldValue ); dStrcpy( mFieldValue, pFieldValue, MAX_TAML_NODE_FIELDVALUE_LENGTH );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
Engine/source/persistence/taml/tamlCustom.h
View file

@ -334,7 +334,7 @@ public:
// Sanity! // Sanity!
AssertFatal( fieldNameLength < sizeof(fieldNameBuffer), "TamlCustomField: Field name is too long." ); AssertFatal( fieldNameLength < sizeof(fieldNameBuffer), "TamlCustomField: Field name is too long." );
dStrcpy( fieldNameBuffer, mFieldName ); dStrcpy( fieldNameBuffer, mFieldName, 1024 );
fieldNameBuffer[fieldNameLength-1] = 0; fieldNameBuffer[fieldNameLength-1] = 0;
StringTableEntry fieldName = StringTable->insert( fieldNameBuffer ); StringTableEntry fieldName = StringTable->insert( fieldNameBuffer );
@ -782,4 +782,4 @@ private:
TamlCustomNodeVector mNodes; TamlCustomNodeVector mNodes;
}; };
#endif // _TAML_CUSTOM_H_ #endif // _TAML_CUSTOM_H_

4
Engine/source/persistence/taml/tamlWriteNode.h
View file

@ -54,7 +54,7 @@ public:
// Allocate and copy the value. // Allocate and copy the value.
mpValue = new char[ dStrlen(pValue)+1 ]; mpValue = new char[ dStrlen(pValue)+1 ];
dStrcpy( (char *)mpValue, pValue ); dStrcpy( (char *)mpValue, pValue, dStrlen(pValue) + 1 );
} }
@ -113,4 +113,4 @@ public:
TamlCustomNodes mCustomNodes; TamlCustomNodes mCustomNodes;
}; };
#endif // _TAML_WRITE_NODE_H_ #endif // _TAML_WRITE_NODE_H_

2
Engine/source/platform/nativeDialogs/fileDialog.cpp
View file

@ -433,7 +433,7 @@ bool FileDialog::setDefaultPath(void *object, const char *index, const char *dat
// Copy and Backslash the path (Windows dialogs are VERY picky about this format) // Copy and Backslash the path (Windows dialogs are VERY picky about this format)
static char szPathValidate[512]; static char szPathValidate[512];
dStrcpy(szPathValidate, data); dStrcpy(szPathValidate, data, 512);
Platform::makeFullPathName(data, szPathValidate, sizeof(szPathValidate)); Platform::makeFullPathName(data, szPathValidate, sizeof(szPathValidate));
//backslash( szPathValidate ); //backslash( szPathValidate );

2
Engine/source/platform/platformFileIO.cpp
View file

@ -534,7 +534,7 @@ StringTableEntry Platform::makeRelativePathName(const char *path, const char *to
// Copy the rest // Copy the rest
if(*branch) if(*branch)
dStrcpy(bufPtr, branch + 1); dStrcpy(bufPtr, branch + 1, temp.size - (bufPtr - temp.ptr));
else else
*--bufPtr = 0; *--bufPtr = 0;

2
Engine/source/platform/platformMemory.cpp
View file

@ -1130,7 +1130,7 @@ static void logFree(const AllocatedHeader* hdr)
void enableLogging(const char* fileName) void enableLogging(const char* fileName)
{ {
dStrcpy(gLogFilename, fileName); dStrcpy(gLogFilename, fileName, 256);
if (!gEnableLogging) if (!gEnableLogging)
{ {
gEnableLogging = true; gEnableLogging = true;

6
Engine/source/platform/platformNet.cpp
View file

@ -280,7 +280,7 @@ namespace PlatformNetState
if (addressString[0] == '[') if (addressString[0] == '[')
{ {
// Must be ipv6 notation // Must be ipv6 notation
dStrcpy(outAddress, addressString+1); dStrcpy(outAddress, addressString+1, 256);
addressString = outAddress; addressString = outAddress;
portString = dStrchr(outAddress, ']'); portString = dStrchr(outAddress, ']');
@ -305,7 +305,7 @@ namespace PlatformNetState
} }
else else
{ {
dStrcpy(outAddress, addressString); dStrcpy(outAddress, addressString, 256);
addressString = outAddress; addressString = outAddress;
// Check to see if we have multiple ":" which would indicate this is an ipv6 address // Check to see if we have multiple ":" which would indicate this is an ipv6 address
@ -546,7 +546,7 @@ static PolledSocket* addPolledSocket(NetSocket handleFd, SOCKET fd, S32 state,
sock->handleFd = handleFd; sock->handleFd = handleFd;
sock->state = state; sock->state = state;
if (remoteAddr) if (remoteAddr)
dStrcpy(sock->remoteAddr, remoteAddr); dStrcpy(sock->remoteAddr, remoteAddr, 256);
if (port != -1) if (port != -1)
sock->remotePort = port; sock->remotePort = port;
gPolledSockets.push_back(sock); gPolledSockets.push_back(sock);

2
Engine/source/platform/platformRedBook.cpp
View file

@ -94,7 +94,7 @@ void RedBook::setLastError(const char * error)
if(!error || dStrlen(error) >= sizeof(smLastError)) if(!error || dStrlen(error) >= sizeof(smLastError))
setLastError("Invalid error string passed"); setLastError("Invalid error string passed");
else else
dStrcpy(smLastError, error); dStrcpy(smLastError, error, 1024);
} }
const char * RedBook::getLastError() const char * RedBook::getLastError()

18
Engine/source/platform/profiler.cpp
View file

@ -328,9 +328,9 @@ const char * Profiler::constructProfilePath(ProfilerData * pd)
U32 mark = FrameAllocator::getWaterMark(); U32 mark = FrameAllocator::getWaterMark();
char * buf = (char*)FrameAllocator::alloc(len+1); char * buf = (char*)FrameAllocator::alloc(len+1);
dStrcpy(buf,pd->mParent->mPath); dStrcpy(buf,pd->mParent->mPath,len+1);
dStrcat(buf,connector,len); dStrcat(buf,connector,len+1);
dStrcat(buf,pd->mRoot->mName,len); dStrcat(buf,pd->mRoot->mName,len+1);
const char * ret = StringTable->insert(buf); const char * ret = StringTable->insert(buf);
FrameAllocator::setWaterMark(mark); FrameAllocator::setWaterMark(mark);
@ -433,7 +433,7 @@ void Profiler::dumpToFile(const char* fileName)
AssertFatal(dStrlen(fileName) < DumpFileNameLength, "Error, dump filename too long"); AssertFatal(dStrlen(fileName) < DumpFileNameLength, "Error, dump filename too long");
mDumpToFile = true; mDumpToFile = true;
mDumpToConsole = false; mDumpToConsole = false;
dStrcpy(mDumpFileName, fileName); dStrcpy(mDumpFileName, fileName, DumpFileNameLength);
} }
void Profiler::hashPop(ProfilerRootData *expected) void Profiler::hashPop(ProfilerRootData *expected)
@ -645,11 +645,11 @@ void Profiler::dump()
AssertFatal(success, "Cannot write profile dump to specified file!"); AssertFatal(success, "Cannot write profile dump to specified file!");
char buffer[1024]; char buffer[1024];
dStrcpy(buffer, "Profiler Data Dump:\n"); dStrcpy(buffer, "Profiler Data Dump:\n", 1024);
fws.write(dStrlen(buffer), buffer); fws.write(dStrlen(buffer), buffer);
dStrcpy(buffer, "Ordered by non-sub total time -\n"); dStrcpy(buffer, "Ordered by non-sub total time -\n", 1024);
fws.write(dStrlen(buffer), buffer); fws.write(dStrlen(buffer), buffer);
dStrcpy(buffer, "%%NSTime %% Time Invoke # Name\n"); dStrcpy(buffer, "%%NSTime %% Time Invoke # Name\n", 1024);
fws.write(dStrlen(buffer), buffer); fws.write(dStrlen(buffer), buffer);
for(U32 i = 0; i < rootVector.size(); i++) for(U32 i = 0; i < rootVector.size(); i++)
@ -665,9 +665,9 @@ void Profiler::dump()
rootVector[i]->mTotalTime = 0; rootVector[i]->mTotalTime = 0;
rootVector[i]->mSubTime = 0; rootVector[i]->mSubTime = 0;
} }
dStrcpy(buffer, "\nOrdered by non-sub total time -\n"); dStrcpy(buffer, "\nOrdered by non-sub total time -\n", 1024);
fws.write(dStrlen(buffer), buffer); fws.write(dStrlen(buffer), buffer);
dStrcpy(buffer, "%%NSTime %% Time Invoke # Name\n"); dStrcpy(buffer, "%%NSTime %% Time Invoke # Name\n", 1024);
fws.write(dStrlen(buffer), buffer); fws.write(dStrlen(buffer), buffer);
mCurrentProfilerData->mTotalTime = endHighResolutionTimer(mCurrentProfilerData->mStartTime); mCurrentProfilerData->mTotalTime = endHighResolutionTimer(mCurrentProfilerData->mStartTime);

2
Engine/source/platformMac/macFileIO.mm
View file

@ -894,7 +894,7 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve
{ {
char child[1024]; char child[1024];
if ( (basePath[dStrlen(basePath) - 1]) == '/') if ( (basePath[dStrlen(basePath) - 1]) == '/')
dStrcpy (child, d->d_name); dStrcpy (child, d->d_name, 1024);
else else
dSprintf(child, 1024, "/%s", d->d_name); dSprintf(child, 1024, "/%s", d->d_name);
if (currentDepth < recurseDepth || recurseDepth == -1) if (currentDepth < recurseDepth || recurseDepth == -1)

2
Engine/source/platformWin32/minidump/winMiniDump.cpp
View file

@ -144,7 +144,7 @@ INT CreateMiniDump( LPEXCEPTION_POINTERS ExceptionInfo)
//copy over the pdb file //copy over the pdb file
char pdbName[1024]; char pdbName[1024];
dStrcpy(pdbName, exeName); dStrcpy(pdbName, exeName, 1024);
dStrncat(pdbName, ".pdb", 4); dStrncat(pdbName, ".pdb", 4);
dSprintf(fromFile, 2048, "%s/%s", Platform::getCurrentDirectory(), pdbName ); dSprintf(fromFile, 2048, "%s/%s", Platform::getCurrentDirectory(), pdbName );
dSprintf(fileName, 2048, "%s/%s", crashPath, pdbName ); dSprintf(fileName, 2048, "%s/%s", crashPath, pdbName );

10
Engine/source/platformWin32/nativeDialogs/fileDialog.cpp
View file

@ -142,7 +142,7 @@ static UINT_PTR CALLBACK FolderHookProc(HWND hdlg, UINT uMsg, WPARAM wParam, LPA
#ifdef UNICODE #ifdef UNICODE
convertUTF16toUTF8(buf, filePath); convertUTF16toUTF8(buf, filePath);
#else #else
dStrcpy( filePath, buf ); dStrcpy( filePath, buf, MAX_PATH );
#endif #endif
// [tom, 12/8/2006] Hack to remove files from the list because // [tom, 12/8/2006] Hack to remove files from the list because
@ -333,8 +333,8 @@ bool FileDialog::Execute()
char pszFile[MAX_PATH]; char pszFile[MAX_PATH];
char pszFilter[1024]; char pszFilter[1024];
char pszFileTitle[MAX_PATH]; char pszFileTitle[MAX_PATH];
dStrcpy( pszFile, mData.mDefaultFile ); dStrcpy( pszFile, mData.mDefaultFile, MAX_PATH );
dStrcpy( pszFilter, mData.mFilters ); dStrcpy( pszFilter, mData.mFilters, 1024 );
const char* pszInitialDir = mData.mDefaultPath; const char* pszInitialDir = mData.mDefaultPath;
const char* pszTitle = mData.mTitle; const char* pszTitle = mData.mTitle;
@ -447,7 +447,7 @@ bool FileDialog::Execute()
convertUTF16toUTF8DoubleNULL( (UTF16*)pszFile, (UTF8*)pszResult, sizeof(pszResult)); convertUTF16toUTF8DoubleNULL( (UTF16*)pszFile, (UTF8*)pszResult, sizeof(pszResult));
#else #else
if(pszFileTitle[0] || ! ( mData.mStyle & FileDialogData::FDS_OPEN && mData.mStyle & FileDialogData::FDS_MULTIPLEFILES )) if(pszFileTitle[0] || ! ( mData.mStyle & FileDialogData::FDS_OPEN && mData.mStyle & FileDialogData::FDS_MULTIPLEFILES ))
dStrcpy(pszResult,pszFile); dStrcpy(pszResult,pszFile,MAX_PATH);
else else
{ {
// [tom, 1/4/2007] pszResult is a double-NULL terminated, NULL separated list in this case so we can't just dSstrcpy() // [tom, 1/4/2007] pszResult is a double-NULL terminated, NULL separated list in this case so we can't just dSstrcpy()
@ -614,7 +614,7 @@ bool FileDialog::setDefaultPath( void *object, const char *index, const char *da
// Copy and Backslash the path (Windows dialogs are VERY picky about this format) // Copy and Backslash the path (Windows dialogs are VERY picky about this format)
static char szPathValidate[512]; static char szPathValidate[512];
dStrcpy( szPathValidate, data ); dStrcpy( szPathValidate, data, 512 );
Platform::makeFullPathName( data,szPathValidate, sizeof(szPathValidate)); Platform::makeFullPathName( data,szPathValidate, sizeof(szPathValidate));
backslash( szPathValidate ); backslash( szPathValidate );

2
Engine/source/platformWin32/winDInputDevice.cpp
View file

@ -1576,7 +1576,7 @@ const char* DInputDevice::getJoystickAxesString()
} }
char* returnString = Con::getReturnBuffer( dStrlen( buf ) + 1 ); char* returnString = Con::getReturnBuffer( dStrlen( buf ) + 1 );
dStrcpy( returnString, buf ); dStrcpy( returnString, buf, dStrlen(buf) + 1 );
return( returnString ); return( returnString );
} }

30
Engine/source/platformWin32/winFileio.cpp
View file

@ -56,7 +56,7 @@ bool dFileDelete(const char * name)
#ifdef UNICODE #ifdef UNICODE
convertUTF8toUTF16N( name, buf, buf.size ); convertUTF8toUTF16N( name, buf, buf.size );
#else #else
dStrcpy( buf, name ); dStrcpy( buf, name, buf.size );
#endif #endif
backslash( buf ); backslash( buf );
@ -88,8 +88,8 @@ bool dFileRename(const char *oldName, const char *newName)
convertUTF8toUTF16N( oldName, oldf, oldf.size ); convertUTF8toUTF16N( oldName, oldf, oldf.size );
convertUTF8toUTF16N( newName, newf, newf.size ); convertUTF8toUTF16N( newName, newf, newf.size );
#else #else
dStrcpy(oldf, oldName); dStrcpy(oldf, oldName, oldf.size);
dStrcpy(newf, newName); dStrcpy(newf, newName, newf.size);
#endif #endif
backslash(oldf); backslash(oldf);
backslash(newf); backslash(newf);
@ -106,7 +106,7 @@ bool dFileTouch(const char * name)
#ifdef UNICODE #ifdef UNICODE
convertUTF8toUTF16N( name, buf, buf.size ); convertUTF8toUTF16N( name, buf, buf.size );
#else #else
dStrcpy( buf, name ); dStrcpy( buf, name, buf.size );
#endif #endif
backslash( buf ); backslash( buf );
@ -133,8 +133,8 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
convertUTF8toUTF16N( fromName, from, from.size ); convertUTF8toUTF16N( fromName, from, from.size );
convertUTF8toUTF16N( toName, to, to.size ); convertUTF8toUTF16N( toName, to, to.size );
#else #else
dStrcpy( from, fromName ); dStrcpy( from, fromName, from.size );
dStrcpy( to, toName ); dStrcpy( to, toName, to.size );
#endif #endif
backslash( from ); backslash( from );
@ -270,7 +270,7 @@ File::FileStatus File::open(const char *filename, const AccessMode openMode)
#ifdef UNICODE #ifdef UNICODE
convertUTF8toUTF16N( filename, fname, fname.size ); convertUTF8toUTF16N( filename, fname, fname.size );
#else #else
dStrcpy(fname, filename); dStrcpy(fname, filename, fname.size);
#endif #endif
backslash( fname ); backslash( fname );
@ -679,7 +679,7 @@ bool Platform::getFileTimes(const char *filePath, FileTime *createTime, FileTime
#ifdef UNICODE #ifdef UNICODE
convertUTF8toUTF16N( filePath, fp, fp.size ); convertUTF8toUTF16N( filePath, fp, fp.size );
#else #else
dStrcpy( fp, filePath ); dStrcpy( fp, filePath, fp.size );
#endif #endif
backslash( fp ); backslash( fp );
@ -834,7 +834,7 @@ bool Platform::setCurrentDirectory(StringTableEntry newDir)
#ifdef UNICODE #ifdef UNICODE
convertUTF8toUTF16N( newDir, buf, buf.size - 1 ); convertUTF8toUTF16N( newDir, buf, buf.size - 1 );
#else #else
dStrcpy( buf, newDir ); dStrcpy( buf, newDir, buf.size );
#endif #endif
backslash( buf ); backslash( buf );
@ -949,7 +949,7 @@ bool Platform::isFile(const char *pFilePath)
#ifdef UNICODE #ifdef UNICODE
convertUTF8toUTF16N( pFilePath, buf, buf.size ); convertUTF8toUTF16N( pFilePath, buf, buf.size );
#else #else
dStrcpy( buf, pFilePath ); dStrcpy( buf, pFilePath, buf.size );
#endif #endif
backslash( buf ); backslash( buf );
@ -988,7 +988,7 @@ S32 Platform::getFileSize(const char *pFilePath)
#ifdef UNICODE #ifdef UNICODE
convertUTF8toUTF16N( pFilePath, buf, buf.size ); convertUTF8toUTF16N( pFilePath, buf, buf.size );
#else #else
dStrcpy( buf, pFilePath ); dStrcpy( buf, pFilePath, buf.size );
#endif #endif
backslash( buf ); backslash( buf );
@ -1025,7 +1025,7 @@ bool Platform::isDirectory(const char *pDirPath)
#ifdef UNICODE #ifdef UNICODE
convertUTF8toUTF16N( pDirPath, buf, buf.size ); convertUTF8toUTF16N( pDirPath, buf, buf.size );
#else #else
dStrcpy( buf, pDirPath ); dStrcpy( buf, pDirPath, buf.size );
#endif #endif
backslash( buf ); backslash( buf );
@ -1072,8 +1072,8 @@ bool Platform::isSubDirectory(const char *pParent, const char *pDir)
convertUTF8toUTF16N( fileName, file, file.size ); convertUTF8toUTF16N( fileName, file, file.size );
convertUTF8toUTF16N( pDir, dir, dir.size ); convertUTF8toUTF16N( pDir, dir, dir.size );
#else #else
dStrcpy( file, fileName ); dStrcpy( file, fileName, file.size );
dStrcpy( dir, pDir ); dStrcpy( dir, pDir, dir.size );
#endif #endif
backslash( file ); backslash( file );
@ -1257,7 +1257,7 @@ bool Platform::hasSubDirectory(const char *pPath)
// Compose our search string - Format : ([path]/[subpath]/*) // Compose our search string - Format : ([path]/[subpath]/*)
char trail = pPath[ dStrlen(pPath) - 1 ]; char trail = pPath[ dStrlen(pPath) - 1 ];
if( trail == '/' ) if( trail == '/' )
dStrcpy( searchBuf, pPath ); dStrcpy( searchBuf, pPath, 1024 );
else else
dSprintf(searchBuf, 1024, "%s/*", pPath ); dSprintf(searchBuf, 1024, "%s/*", pPath );

2
Engine/source/platformWin32/winRedbook.cpp
View file

@ -84,7 +84,7 @@ void installRedBookDevices()
{ {
Win32RedBookDevice * device = new Win32RedBookDevice; Win32RedBookDevice * device = new Win32RedBookDevice;
device->mDeviceName = new char[dStrlen(str) + 1]; device->mDeviceName = new char[dStrlen(str) + 1];
dStrcpy(device->mDeviceName, str); dStrcpy(device->mDeviceName, str, dStrlen(str) + 1);
RedBook::installDevice(device); RedBook::installDevice(device);
} }

2
Engine/source/platformWin32/winWindow.cpp
View file

@ -606,7 +606,7 @@ const char* Platform::getLoginPassword()
if ( RegQueryValueEx( regKey, dT("LoginPassword"), NULL, NULL, buf, &size ) == ERROR_SUCCESS ) if ( RegQueryValueEx( regKey, dT("LoginPassword"), NULL, NULL, buf, &size ) == ERROR_SUCCESS )
{ {
returnString = Con::getReturnBuffer( size + 1 ); returnString = Con::getReturnBuffer( size + 1 );
dStrcpy( returnString, (const char*) buf ); dStrcpy( returnString, (const char*) buf, size + 1 );
} }
RegCloseKey( regKey ); RegCloseKey( regKey );

4
Engine/source/sfx/openal/sfxALProvider.cpp
View file

@ -114,7 +114,7 @@ void SFXALProvider::init()
dSprintf( temp, sizeof( temp ), "[EAX %d.0] %s", eax, ( mALDL->IsExtensionSupported( i, SFXALEAXRAM ) ? "EAX-RAM" : "" ) ); dSprintf( temp, sizeof( temp ), "[EAX %d.0] %s", eax, ( mALDL->IsExtensionSupported( i, SFXALEAXRAM ) ? "EAX-RAM" : "" ) );
} }
else else
dStrcpy( temp, "" ); dStrcpy( temp, "", 256 );
info->driver = String::ToString( deviceFormat, major, minor, temp ); info->driver = String::ToString( deviceFormat, major, minor, temp );
info->hasHardware = eax > 0; info->hasHardware = eax > 0;
@ -144,4 +144,4 @@ SFXDevice *SFXALProvider::createDevice( const String& deviceName, bool useHardwa
return new SFXALDevice( this, mOpenAL, info->name, useHardware, maxBuffers ); return new SFXALDevice( this, mOpenAL, info->name, useHardware, maxBuffers );
return NULL; return NULL;
} }

4
Engine/source/shaderGen/GLSL/shaderCompGLSL.cpp
View file

@ -142,7 +142,7 @@ void AppVertConnectorGLSL::sortVars()
void AppVertConnectorGLSL::setName( char *newName ) void AppVertConnectorGLSL::setName( char *newName )
{ {
dStrcpy( (char*)mName, newName ); dStrcpy( (char*)mName, newName, 32 );
} }
void AppVertConnectorGLSL::reset() void AppVertConnectorGLSL::reset()
@ -287,7 +287,7 @@ void VertPixelConnectorGLSL::sortVars()
void VertPixelConnectorGLSL::setName( char *newName ) void VertPixelConnectorGLSL::setName( char *newName )
{ {
dStrcpy( (char*)mName, newName ); dStrcpy( (char*)mName, newName, 32 );
} }
void VertPixelConnectorGLSL::reset() void VertPixelConnectorGLSL::reset()

4
Engine/source/shaderGen/langElement.cpp
View file

@ -87,7 +87,7 @@ U32 Var::texUnitCount = 0;
Var::Var() Var::Var()
{ {
dStrcpy( (char*)type, "float4" ); dStrcpy( (char*)type, "float4", 32 );
structName[0] = '\0'; structName[0] = '\0';
connectName[0] = '\0'; connectName[0] = '\0';
constSortPos = cspUninit; constSortPos = cspUninit;
@ -209,4 +209,4 @@ void MultiLine::print( Stream &stream )
{ {
mStatementList[i]->print( stream ); mStatementList[i]->print( stream );
} }
} }

4
Engine/source/shaderGen/shaderGen.cpp
View file

@ -153,8 +153,8 @@ void ShaderGen::generateShader( const MaterialFeatureData &featureData,
dSprintf( vertShaderName, sizeof(vertShaderName), "shadergen:/%s_V.%s", cacheName, mFileEnding.c_str() ); dSprintf( vertShaderName, sizeof(vertShaderName), "shadergen:/%s_V.%s", cacheName, mFileEnding.c_str() );
dSprintf( pixShaderName, sizeof(pixShaderName), "shadergen:/%s_P.%s", cacheName, mFileEnding.c_str() ); dSprintf( pixShaderName, sizeof(pixShaderName), "shadergen:/%s_P.%s", cacheName, mFileEnding.c_str() );
dStrcpy( vertFile, vertShaderName ); dStrcpy( vertFile, vertShaderName, 256 );
dStrcpy( pixFile, pixShaderName ); dStrcpy( pixFile, pixShaderName, 256 );
// this needs to change - need to optimize down to ps v.1.1 // this needs to change - need to optimize down to ps v.1.1
*pixVersion = GFX->getPixelShaderVersion(); *pixVersion = GFX->getPixelShaderVersion();

12
Engine/source/sim/actionMap.cpp
View file

@ -245,7 +245,7 @@ void ActionMap::dumpActionMap(const char* fileName, const bool append) const
else else
{ {
// IMPORTANT -- do NOT change the following line, it identifies the file as an input map file // IMPORTANT -- do NOT change the following line, it identifies the file as an input map file
dStrcpy( lineBuffer, "// Torque Input Map File\n" ); dStrcpy( lineBuffer, "// Torque Input Map File\n", 1024 );
iostrm->write( dStrlen( lineBuffer ), lineBuffer ); iostrm->write( dStrlen( lineBuffer ), lineBuffer );
} }
@ -453,7 +453,7 @@ void ActionMap::dumpActionMap(const char* fileName, const bool append) const
bool ActionMap::createEventDescriptor(const char* pEventString, EventDescriptor* pDescriptor) bool ActionMap::createEventDescriptor(const char* pEventString, EventDescriptor* pDescriptor)
{ {
char copyBuffer[256]; char copyBuffer[256];
dStrcpy(copyBuffer, pEventString); dStrcpy(copyBuffer, pEventString, 256);
// Do we have modifiers? // Do we have modifiers?
char* pSpace = dStrchr(copyBuffer, ' '); char* pSpace = dStrchr(copyBuffer, ' ');
@ -909,7 +909,7 @@ const char* ActionMap::getDeadZone( const char* device, const char* action )
char buf[64]; char buf[64];
dSprintf( buf, sizeof( buf ), "%g %g", mapNode->deadZoneBegin, mapNode->deadZoneEnd ); dSprintf( buf, sizeof( buf ), "%g %g", mapNode->deadZoneBegin, mapNode->deadZoneEnd );
char* returnString = Con::getReturnBuffer( dStrlen( buf ) + 1 ); char* returnString = Con::getReturnBuffer( dStrlen( buf ) + 1 );
dStrcpy( returnString, buf ); dStrcpy( returnString, buf, dStrlen(buf) + 1 );
return( returnString ); return( returnString );
} }
else else
@ -995,7 +995,7 @@ bool ActionMap::getDeviceName(const U32 deviceType, const U32 deviceInstance, ch
{ {
switch (deviceType) { switch (deviceType) {
case KeyboardDeviceType: case KeyboardDeviceType:
dStrcpy(buffer, "keyboard"); dStrcpy(buffer, "keyboard", 16);
break; break;
case MouseDeviceType: case MouseDeviceType:
@ -1135,7 +1135,7 @@ bool ActionMap::getKeyString(const U32 action, char* buffer)
for (U32 i = 0; gAsciiMap[i].asciiCode != 0xFFFF; i++) { for (U32 i = 0; gAsciiMap[i].asciiCode != 0xFFFF; i++) {
if (gAsciiMap[i].asciiCode == asciiCode) if (gAsciiMap[i].asciiCode == asciiCode)
{ {
dStrcpy(buffer, gAsciiMap[i].pDescription); dStrcpy(buffer, gAsciiMap[i].pDescription, 16);
return true; return true;
} }
} }
@ -1166,7 +1166,7 @@ bool ActionMap::getKeyString(const U32 action, char* buffer)
const char* desc = INPUTMGR->findVirtualMapDescFromCode(action); const char* desc = INPUTMGR->findVirtualMapDescFromCode(action);
if(desc) if(desc)
{ {
dStrcpy(buffer, desc); dStrcpy(buffer, desc, 16);
return true; return true;
} }
} }

2
Engine/source/sim/netDownload.cpp
View file

@ -53,7 +53,7 @@ public:
for(U32 i = 0; i < nameCount; i++) for(U32 i = 0; i < nameCount; i++)
{ {
dStrcpy(mFileNames[i], (*nameList)[i]); dStrcpy(mFileNames[i], (*nameList)[i], 256);
//Con::printf("Sending request for file %s", mFileNames[i]); //Con::printf("Sending request for file %s", mFileNames[i]);
} }
} }

4
Engine/source/sim/netStringTable.cpp
View file

@ -97,7 +97,7 @@ U32 NetStringTable::addString(const char *string)
} }
table[e].refCount++; table[e].refCount++;
table[e].string = (char *) allocator->alloc(dStrlen(string) + 1); table[e].string = (char *) allocator->alloc(dStrlen(string) + 1);
dStrcpy(table[e].string, string); dStrcpy(table[e].string, string, dStrlen(string) + 1);
table[e].next = hashTable[bucket]; table[e].next = hashTable[bucket];
hashTable[bucket] = e; hashTable[bucket] = e;
table[e].link = firstValid; table[e].link = firstValid;
@ -179,7 +179,7 @@ void NetStringTable::repack()
table[walk].string = (char *) newAllocator->alloc(dStrlen(prevStr) + 1); table[walk].string = (char *) newAllocator->alloc(dStrlen(prevStr) + 1);
dStrcpy(table[walk].string, prevStr); dStrcpy(table[walk].string, prevStr, dStrlen(prevStr) + 1);
} }
delete allocator; delete allocator;
allocator = newAllocator; allocator = newAllocator;

4
Engine/source/terrain/terrData.cpp
View file

@ -1303,7 +1303,7 @@ DefineEngineMethod( TerrainBlock, save, bool, ( const char* fileName),,
"@return True if file save was successful, false otherwise") "@return True if file save was successful, false otherwise")
{ {
char filename[256]; char filename[256];
dStrcpy(filename,fileName); dStrcpy(filename,fileName,256);
char *ext = dStrrchr(filename, '.'); char *ext = dStrrchr(filename, '.');
if (!ext || dStricmp(ext, ".ter") != 0) if (!ext || dStricmp(ext, ".ter") != 0)
dStrcat(filename, ".ter", 256); dStrcat(filename, ".ter", 256);
@ -1313,7 +1313,7 @@ DefineEngineMethod( TerrainBlock, save, bool, ( const char* fileName),,
//ConsoleMethod(TerrainBlock, save, bool, 3, 3, "(string fileName) - saves the terrain block's terrain file to the specified file name.") //ConsoleMethod(TerrainBlock, save, bool, 3, 3, "(string fileName) - saves the terrain block's terrain file to the specified file name.")
//{ //{
// char filename[256]; // char filename[256];
// dStrcpy(filename,argv[2]); // dStrcpy(filename,argv[2],256);
// char *ext = dStrrchr(filename, '.'); // char *ext = dStrrchr(filename, '.');
// if (!ext || dStricmp(ext, ".ter") != 0) // if (!ext || dStricmp(ext, ".ter") != 0)
// dStrcat(filename, ".ter", 256); // dStrcat(filename, ".ter", 256);

2
Engine/source/util/messaging/eventManager.cpp
View file

@ -289,7 +289,7 @@ bool EventManager::subscribe(SimObject *callbackObj, const char* event, const ch
else else
{ {
cb = new char[dStrlen(callback) + 1]; cb = new char[dStrlen(callback) + 1];
dStrcpy(cb, callback); dStrcpy(cb, callback, dStrlen(callback) + 1);
} }
// Create the subscriber object. // Create the subscriber object.

4
Engine/source/util/undo.cpp
View file

@ -546,7 +546,7 @@ DefineConsoleMethod(UndoManager, getNextUndoName, const char *, (),, "UndoManage
if(!name) if(!name)
return NULL; return NULL;
char *ret = Con::getReturnBuffer(dStrlen(name) + 1); char *ret = Con::getReturnBuffer(dStrlen(name) + 1);
dStrcpy(ret, name); dStrcpy(ret, name, dStrlen(name) + 1);
return ret; return ret;
} }
@ -557,7 +557,7 @@ DefineConsoleMethod(UndoManager, getNextRedoName, const char *, (),, "UndoManage
if(!name) if(!name)
return NULL; return NULL;
char *ret = Con::getReturnBuffer(dStrlen(name) + 1); char *ret = Con::getReturnBuffer(dStrlen(name) + 1);
dStrcpy(ret, name); dStrcpy(ret, name, dStrlen(name) + 1);
return ret; return ret;
} }