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

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
This commit is contained in:
Azaezel 2018-03-28 15:42:34 -05:00
commit cbce2ee805
154 changed files with 2950 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ bool fsTiXmlDocument::LoadFile( const char * pFilename, TiXmlEncoding encoding )
#ifdef TORQUE_OS_ANDROID
if (strlen(pFilename) > strlen(filenameBuffer)) {
strcpy(filenameBuffer, pFilename);
dStrcpy(filenameBuffer, pFilename, 1024);
}
#endif

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_

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

@ -53,8 +53,9 @@ public:
mName = name;
// Allocate and copy the value.
mpValue = new char[ dStrlen(pValue)+1 ];
dStrcpy( (char *)mpValue, pValue );
dsize_t valueLen = dStrlen(pValue) + 1;
mpValue = new char[ valueLen ];
dStrcpy( (char *)mpValue, pValue, valueLen );
}
@ -113,4 +114,4 @@ public:
TamlCustomNodes mCustomNodes;
};
#endif // _TAML_WRITE_NODE_H_
#endif // _TAML_WRITE_NODE_H_

2
Engine/source/persistence/taml/xml/tamlXmlParser.cpp
View file

@ -53,7 +53,7 @@ bool TamlXmlParser::accept( const char* pFilename, TamlVisitor& visitor )
#ifdef TORQUE_OS_ANDROID
if (strlen(pFilename) > strlen(filenameBuffer)) {
strcpy(filenameBuffer, pFilename);
dStrcpy(filenameBuffer, pFilename, 1024);
}
#endif