TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

@ -245,7 +245,7 @@ void ActionMap::dumpActionMap(const char* fileName, const bool append) const
else
{
// 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 );
}
@ -453,7 +453,7 @@ void ActionMap::dumpActionMap(const char* fileName, const bool append) const
bool ActionMap::createEventDescriptor(const char* pEventString, EventDescriptor* pDescriptor)
{
char copyBuffer[256];
dStrcpy(copyBuffer, pEventString);
dStrcpy(copyBuffer, pEventString, 256);
// Do we have modifiers?
char* pSpace = dStrchr(copyBuffer, ' ');
@ -909,7 +909,7 @@ const char* ActionMap::getDeadZone( const char* device, const char* action )
char buf[64];
dSprintf( buf, sizeof( buf ), "%g %g", mapNode->deadZoneBegin, mapNode->deadZoneEnd );
char* returnString = Con::getReturnBuffer( dStrlen( buf ) + 1 );
dStrcpy( returnString, buf );
dStrcpy( returnString, buf, dStrlen(buf) + 1 );
return( returnString );
}
else
@ -995,7 +995,7 @@ bool ActionMap::getDeviceName(const U32 deviceType, const U32 deviceInstance, ch
{
switch (deviceType) {
case KeyboardDeviceType:
dStrcpy(buffer, "keyboard");
dStrcpy(buffer, "keyboard", 16);
break;
case MouseDeviceType:
@ -1135,7 +1135,7 @@ bool ActionMap::getKeyString(const U32 action, char* buffer)
for (U32 i = 0; gAsciiMap[i].asciiCode != 0xFFFF; i++) {
if (gAsciiMap[i].asciiCode == asciiCode)
{
dStrcpy(buffer, gAsciiMap[i].pDescription);
dStrcpy(buffer, gAsciiMap[i].pDescription, 16);
return true;
}
}
@ -1166,7 +1166,7 @@ bool ActionMap::getKeyString(const U32 action, char* buffer)
const char* desc = INPUTMGR->findVirtualMapDescFromCode(action);
if(desc)
{
dStrcpy(buffer, desc);
dStrcpy(buffer, desc, 16);
return true;
}
}

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

@ -53,7 +53,7 @@ public:
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]);
}
}

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

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