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

Replace c char array with std::string to address Coverity scan reported issue

Browse Source
This commit is contained in:
Robert Osfield 2017-10-31 16:46:42 +00:00
parent 3459e8f4fd
commit 95eb5e2ad6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgPlugins/stl/ReaderWriterSTL.cpp
View File

@ -400,12 +400,12 @@ const float StlColorDepth = float(StlColorSize); // 2^5 - 1
// Magics files have a header with a "COLOR=" field giving the color of the whole model // Magics files have a header with a "COLOR=" field giving the color of the whole model
bool fileComesFromMagics(FILE *fp, osg::Vec4& magicsColor) bool fileComesFromMagics(FILE *fp, osg::Vec4& magicsColor)
{ {
char header[80]; std::string header(80, 0);
const float magicsColorDepth = 255.f; const float magicsColorDepth = 255.f;
::rewind(fp); ::rewind(fp);
if (fread((void*) &header, sizeof(header), 1, fp) != 1) if (fread((void*) &(*header.begin()), header.size(), 1, fp) != 1)
return false; return false;
if (::fseek(fp, sizeof_StlHeader, SEEK_SET)!=0) if (::fseek(fp, sizeof_StlHeader, SEEK_SET)!=0)
@ -414,8 +414,7 @@ bool fileComesFromMagics(FILE *fp, osg::Vec4& magicsColor)
} }
std::string magicsColorPattern ("COLOR="); std::string magicsColorPattern ("COLOR=");
std::string headerStr = std::string(header); if(size_t colorFieldPos = header.find(magicsColorPattern) != std::string::npos)
if(size_t colorFieldPos = headerStr.find(magicsColorPattern) != std::string::npos)
{ {
int colorIndex = colorFieldPos + magicsColorPattern.size() - 1; int colorIndex = colorFieldPos + magicsColorPattern.size() - 1;
float r = (uint8_t)header[colorIndex] / magicsColorDepth; float r = (uint8_t)header[colorIndex] / magicsColorDepth;