From 25c25b20b1656d0e78ac4441caa1d8d68bea1634 Mon Sep 17 00:00:00 2001 From: Glenn Smith Date: Wed, 7 Mar 2018 00:49:46 -0500 Subject: [PATCH] Engine was also using raw strcat/strcpy --- Engine/source/cinterface/cinterface.cpp | 4 ++-- Engine/source/persistence/taml/fsTinyXml.cpp | 2 +- Engine/source/persistence/taml/xml/tamlXmlParser.cpp | 2 +- Engine/source/platform/platformCPUCount.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Engine/source/cinterface/cinterface.cpp b/Engine/source/cinterface/cinterface.cpp index f195cd7e7..4f6f1900c 100644 --- a/Engine/source/cinterface/cinterface.cpp +++ b/Engine/source/cinterface/cinterface.cpp @@ -182,8 +182,8 @@ extern "C" { void torque_setexecutablepath(const char* directory) { - gExecutablePath = new char[strlen(directory)+1]; - strcpy(gExecutablePath, directory); + gExecutablePath = new char[dStrlen(directory)+1]; + dStrcpy(gExecutablePath, directory, dStrlen(directory)+1); } // set Torque 3D into web deployment mode (disable fullscreen exlusive mode, etc) diff --git a/Engine/source/persistence/taml/fsTinyXml.cpp b/Engine/source/persistence/taml/fsTinyXml.cpp index 441169742..9fdf3f812 100644 --- a/Engine/source/persistence/taml/fsTinyXml.cpp +++ b/Engine/source/persistence/taml/fsTinyXml.cpp @@ -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 diff --git a/Engine/source/persistence/taml/xml/tamlXmlParser.cpp b/Engine/source/persistence/taml/xml/tamlXmlParser.cpp index b479fa07e..6ba33dd98 100644 --- a/Engine/source/persistence/taml/xml/tamlXmlParser.cpp +++ b/Engine/source/persistence/taml/xml/tamlXmlParser.cpp @@ -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 diff --git a/Engine/source/platform/platformCPUCount.cpp b/Engine/source/platform/platformCPUCount.cpp index fc066f75d..a3fe99d67 100644 --- a/Engine/source/platform/platformCPUCount.cpp +++ b/Engine/source/platform/platformCPUCount.cpp @@ -523,7 +523,7 @@ next: tblPkgID[j] = apicID & PackageIDMask; sprintf(tmp," AffinityMask = %d; Initial APIC = %d; Physical ID = %d, Core ID = %d, SMT ID = %d\n", dwAffinityMask, apicID, tblPkgID[j], tblCoreID[j], tblSMTID[j]); - strcat(g_s3Levels, tmp); + dStrcat(g_s3Levels, tmp, 2048); numLPEnabled ++; // Number of available logical processors in the system. @@ -654,4 +654,4 @@ next: } // namespace CPUInfo #endif -#endif \ No newline at end of file +#endif