From 5b3be8c9fa8d579124360582a757fd25a0a0ffe1 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Mon, 24 Jul 2006 09:49:39 +0000 Subject: [PATCH] Handle buffer overflow. --- stepmania/src/Model.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index 4807b2d8d8..a2ce87862d 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -176,7 +176,6 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath ) { m_Materials.resize( nNumMaterials ); - // XXX: handle buffer overflow char szName[256]; for( int i = 0; i < nNumMaterials; i++ ) @@ -186,8 +185,7 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath ) // name if( f.GetLine( sLine ) <= 0 ) THROW; - // XXX: handle buffer overflow - if( sscanf(sLine, "\"%[^\"]\"", szName) != 1 ) + if( sscanf(sLine, "\"%256[^\"]\"", szName) != 1 ) THROW; Material.sName = szName; @@ -243,7 +241,7 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath ) if( f.GetLine( sLine ) <= 0 ) THROW; strcpy( szName, "" ); - sscanf( sLine, "\"%[^\"]\"", szName ); + sscanf( sLine, "\"%256[^\"]\"", szName ); RString sDiffuseTexture = szName; if( sDiffuseTexture == "" ) @@ -270,7 +268,7 @@ void Model::LoadMaterialsFromMilkshapeAscii( const RString &_sPath ) if( f.GetLine( sLine ) <= 0 ) THROW; strcpy( szName, "" ); - sscanf( sLine, "\"%[^\"]\"", szName ); + sscanf( sLine, "\"%256[^\"]\"", szName ); RString sAlphaTexture = szName; if( sAlphaTexture == "" )