TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix buffer overflow

Browse source
This commit is contained in:
Ben Payne 2014-11-11 15:19:52 -05:00
parent a3f4adacc3
commit dd297d4dc0
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Engine/source/platformWin32/winWindow.cpp
View file

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