FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced unsafe c string usage with std::string

Browse Source
This commit is contained in:
Robert Osfield
2016-06-28 16:11:14 +01:00
parent b5f880ba1d
commit dc3d4cac53
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPlugins/txp/ReaderWriterTXP.cpp
View File

@@ -22,13 +22,6 @@
#define ReaderWriterTXPERROR(s) OSG_NOTICE << "txp::ReaderWriterTXP::" << (s) << " error: "
namespace
{
char gbuf[2048];
}
using namespace txp;
int ReaderWriterTXP::_archiveId = 0;
@@ -520,8 +513,8 @@ bool ReaderWriterTXP::extractChildrenLocations(const std::string& name, int pare
return false;
// Extract the data
strcpy(gbuf, name.substr(startOfList + 1, endOfList - startOfList - 1).c_str());
char *token = strtok( gbuf, "_" );
std::string gbuf(name.substr(startOfList + 1, endOfList - startOfList - 1));
char *token = gbuf.empty() ? 0: strtok( &gbuf[0], "_" );
int nbTokenRead = 0;
for(int idx = 0; idx < nbChild; idx++)