TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-25 09:33:50 +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

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

@ -708,7 +708,7 @@ ImplementEnumType(_TamlFormatMode,
U32 nBufferSize = dStrlen(pFieldValue) + 1;
FrameTemp<char> valueCopy(nBufferSize);
dStrcpy((char *)valueCopy, pFieldValue);
dStrcpy((char *)valueCopy, pFieldValue, nBufferSize);
// Skip if field should not be written.
if (!pSimObject->writeField(fieldName, valueCopy))
@ -1547,4 +1547,4 @@ ImplementEnumType(_TamlFormatMode,
TiXmlElement* pAnyElement = new TiXmlElement("xs:any");
pAnyElement->SetAttribute("processContents", "skip");
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
// 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!
AssertFatal( fieldNameLength < sizeof(fieldNameBuffer), "TamlCustomField: Field name is too long." );
dStrcpy( fieldNameBuffer, mFieldName );
dStrcpy( fieldNameBuffer, mFieldName, 1024 );
fieldNameBuffer[fieldNameLength-1] = 0;
StringTableEntry fieldName = StringTable->insert( fieldNameBuffer );
@ -782,4 +782,4 @@ private:
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.
mpValue = new char[ dStrlen(pValue)+1 ];
dStrcpy( (char *)mpValue, pValue );
dStrcpy( (char *)mpValue, pValue, dStrlen(pValue) + 1 );
}
@ -113,4 +113,4 @@ public:
TamlCustomNodes mCustomNodes;
};
#endif // _TAML_WRITE_NODE_H_
#endif // _TAML_WRITE_NODE_H_