actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Handle buffer overflow.

Browse Source
This commit is contained in:
Steve Checkoway
2006-07-24 09:49:39 +00:00
parent 567b4e8c6a
commit 5b3be8c9fa
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Model.cpp
+3 -5
View File
@@ -176,7 +176,6 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath )
{ {
m_Materials.resize( nNumMaterials ); m_Materials.resize( nNumMaterials );
// XXX: handle buffer overflow
char szName[256]; char szName[256];
for( int i = 0; i < nNumMaterials; i++ ) for( int i = 0; i < nNumMaterials; i++ )
@@ -186,8 +185,7 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath )
// name // name
if( f.GetLine( sLine ) <= 0 ) if( f.GetLine( sLine ) <= 0 )
THROW; THROW;
// XXX: handle buffer overflow if( sscanf(sLine, "\"%256[^\"]\"", szName) != 1 )
if( sscanf(sLine, "\"%[^\"]\"", szName) != 1 )
THROW; THROW;
Material.sName = szName; Material.sName = szName;
@@ -243,7 +241,7 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath )
if( f.GetLine( sLine ) <= 0 ) if( f.GetLine( sLine ) <= 0 )
THROW; THROW;
strcpy( szName, "" ); strcpy( szName, "" );
sscanf( sLine, "\"%[^\"]\"", szName ); sscanf( sLine, "\"%256[^\"]\"", szName );
RString sDiffuseTexture = szName; RString sDiffuseTexture = szName;
if( sDiffuseTexture == "" ) if( sDiffuseTexture == "" )
@@ -270,7 +268,7 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath )
if( f.GetLine( sLine ) <= 0 ) if( f.GetLine( sLine ) <= 0 )
THROW; THROW;
strcpy( szName, "" ); strcpy( szName, "" );
sscanf( sLine, "\"%[^\"]\"", szName ); sscanf( sLine, "\"%256[^\"]\"", szName );
RString sAlphaTexture = szName; RString sAlphaTexture = szName;
if( sAlphaTexture == "" ) if( sAlphaTexture == "" )