Fix buffer overflow

This commit is contained in:
Ben Payne 2014-11-11 15:19:52 -05:00
parent a3f4adacc3
commit dd297d4dc0

View file

@ -317,15 +317,16 @@ S32 WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR lpszCmdLine, S32)
{
Vector<char *> argv( __FILE__, __LINE__ );
char moduleName[256];
enum { moduleNameSize = 256 };
char moduleName[moduleNameSize];
#ifdef TORQUE_UNICODE
{
TCHAR buf[ 256 ];
GetModuleFileNameW( NULL, buf, sizeof( buf ) );
convertUTF16toUTF8( buf, moduleName, sizeof( moduleName ) );
TCHAR buf[ moduleNameSize ];
GetModuleFileNameW( NULL, buf, moduleNameSize );
convertUTF16toUTF8( buf, moduleName, moduleNameSize );
}
#else
GetModuleFileNameA(NULL, moduleName, sizeof(moduleName));
GetModuleFileNameA(NULL, moduleName, moduleNameSize);
#endif
argv.push_back(moduleName);
@ -394,15 +395,16 @@ S32 torque_winmain( HINSTANCE hInstance, HINSTANCE, LPSTR lpszCmdLine, S32)
{
Vector<char *> argv( __FILE__, __LINE__ );
char moduleName[256];
enum { moduleNameSize = 256 };
char moduleName[moduleNameSize];
#ifdef TORQUE_UNICODE
{
TCHAR buf[ 256 ];
GetModuleFileNameW( NULL, buf, sizeof( buf ) );
convertUTF16toUTF8( buf, moduleName, sizeof( moduleName ) );
}
{
TCHAR buf[ moduleNameSize ];
GetModuleFileNameW( NULL, buf, moduleNameSize );
convertUTF16toUTF8( buf, moduleName, moduleNameSize );
}
#else
GetModuleFileNameA(NULL, moduleName, sizeof(moduleName));
GetModuleFileNameA(NULL, moduleName, moduleNameSize);
#endif
argv.push_back(moduleName);