YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-11 07:37:52 +00:00
Code Issues Projects Releases Wiki Activity

engine: common: test ParseFile length return value

Browse Source
This commit is contained in:
Alibek Omarov 2021-10-01 20:40:24 +03:00 committed by a1batross
parent 378c4f30f3
commit 004e190435
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
engine/common/common.c
View File

@ -464,14 +464,14 @@ qboolean COM_ParseVector( char **pfile, float *v, size_t size )
if( size == 1 ) if( size == 1 )
{ {
*pfile = COM_ParseFile( *pfile, token ); *pfile = COM_ParseFile( *pfile, token, sizeof( token ));
v[0] = Q_atof( token ); v[0] = Q_atof( token );
return true; return true;
} }
saved = *pfile; saved = *pfile;
if(( *pfile = COM_ParseFile( *pfile, token )) == NULL ) if(( *pfile = COM_ParseFile( *pfile, token, sizeof( token ))) == NULL )
return false; return false;
if( token[0] == '(' ) if( token[0] == '(' )
@ -480,13 +480,13 @@ qboolean COM_ParseVector( char **pfile, float *v, size_t size )
for( i = 0; i < size; i++ ) for( i = 0; i < size; i++ )
{ {
*pfile = COM_ParseFile( *pfile, token ); *pfile = COM_ParseFile( *pfile, token, sizeof( token ));
v[i] = Q_atof( token ); v[i] = Q_atof( token );
} }
if( !bracket ) return true; // done if( !bracket ) return true; // done
if(( *pfile = COM_ParseFile( *pfile, token )) == NULL ) if(( *pfile = COM_ParseFile( *pfile, token, sizeof( token ))) == NULL )
return false; return false;
if( token[0] == ')' ) if( token[0] == ')' )
@ -1169,27 +1169,28 @@ void GAME_EXPORT pfnResetTutorMessageDecayData( void )
void Test_RunCommon( void ) void Test_RunCommon( void )
{ {
char *file = (char*)"q asdf \"qwerty\" \"f \\\"f\" meowmeow\n// comment \"stuff ignored\"\nbark"; char *file = (char *)"q asdf \"qwerty\" \"f \\\"f\" meowmeow\n// comment \"stuff ignored\"\nbark";
int len;
char buf[5]; char buf[5];
Msg( "Checking COM_ParseFile...\n" ); Msg( "Checking COM_ParseFile...\n" );
file = COM_ParseFileSafe( file, buf, sizeof( buf )); file = _COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len );
TASSERT( !Q_strcmp( buf, "q" )); TASSERT( !Q_strcmp( buf, "q" ) && len == 1);
file = COM_ParseFileSafe( file, buf, sizeof( buf )); file = _COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len );
TASSERT( !Q_strcmp( buf, "asdf" )); TASSERT( !Q_strcmp( buf, "asdf" ) && len == 4);
file = COM_ParseFileSafe( file, buf, sizeof( buf )); file = _COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len );
TASSERT( !Q_strcmp( buf, "qwer" )); TASSERT( !Q_strcmp( buf, "qwer" ) && len == -1);
file = COM_ParseFileSafe( file, buf, sizeof( buf )); file = _COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len );
TASSERT( !Q_strcmp( buf, "f \"f" )); TASSERT( !Q_strcmp( buf, "f \"f" ) && len == 4);
file = COM_ParseFileSafe( file, buf, sizeof( buf )); file = _COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len );
TASSERT( !Q_strcmp( buf, "meow" )); TASSERT( !Q_strcmp( buf, "meow" ) && len == -1);
file = COM_ParseFileSafe( file, buf, sizeof( buf )); file = _COM_ParseFileSafe( file, buf, sizeof( buf ), 0, &len );
TASSERT( !Q_strcmp( buf, "bark" )); TASSERT( !Q_strcmp( buf, "bark" ) && len == 4);
} }
#endif #endif