haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed test for invalid numeric strings in VRML files

This commit is contained in:
Cirilo Bernardo 2016-09-26 20:52:31 +10:00 committed by Wayne Stambaugh
parent 213ceaa280
commit 44ba343a7b
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/3d/vrml/wrlproc.cpp
View File

@ -828,12 +828,9 @@ bool WRLPROC::ReadSFFloat( float& aSFFloat )
std::istringstream istr; std::istringstream istr;
istr.str( tmp ); istr.str( tmp );
istr >> aSFFloat; istr >> aSFFloat;
tmp.clear();
istr >> tmp;
if( !tmp.empty() ) if( istr.fail() || !istr.eof() )
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n"; ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n";
@ -901,12 +898,9 @@ bool WRLPROC::ReadSFInt( int& aSFInt32 )
std::istringstream istr; std::istringstream istr;
istr.str( tmp ); istr.str( tmp );
istr >> aSFInt32; istr >> aSFInt32;
tmp.clear();
istr >> tmp;
if( !tmp.empty() ) if( istr.fail() || !istr.eof() )
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n"; ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n";
@ -971,12 +965,9 @@ bool WRLPROC::ReadSFRotation( WRLROTATION& aSFRotation )
std::istringstream istr; std::istringstream istr;
istr.str( tmp ); istr.str( tmp );
istr >> trot[i]; istr >> trot[i];
tmp.clear();
istr >> tmp;
if( !tmp.empty() ) if( istr.fail() || !istr.eof() )
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n"; ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n";
@ -1047,12 +1038,9 @@ bool WRLPROC::ReadSFVec2f( WRLVEC2F& aSFVec2f )
std::istringstream istr; std::istringstream istr;
istr.str( tmp ); istr.str( tmp );
istr >> tcol[i]; istr >> tcol[i];
tmp.clear();
istr >> tmp;
if( !tmp.empty() ) if( istr.fail() || !istr.eof() )
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n"; ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n";
@ -1129,12 +1117,9 @@ bool WRLPROC::ReadSFVec3f( WRLVEC3F& aSFVec3f )
std::istringstream istr; std::istringstream istr;
istr.str( tmp ); istr.str( tmp );
istr >> tcol[i]; istr >> tcol[i];
tmp.clear();
istr >> tmp;
if( !tmp.empty() ) if( istr.fail() || !istr.eof() )
{ {
std::ostringstream ostr; std::ostringstream ostr;
ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n"; ostr << __FILE__ << ":" << __FUNCTION__ << ":" << __LINE__ << "\n";