okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error handling in R_ParseSpawnVars

Browse source 
When R_GetEntityToken returns qfalse it resets pointer for parsing, by
R_ParseSpawnVars not returning qfalse it could cause an infinite loop.

Also add newlines to printfs.
This commit is contained in:
Zack Middleton 2014-03-10 15:54:52 -05:00
parent e7f43545ed
commit b98e6d5cc0
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
code/renderergl2/tr_bsp.c
View file

@ -2749,7 +2749,8 @@ qboolean R_ParseSpawnVars( char *spawnVarChars, int maxSpawnVarChars, int *numSp
return qfalse; return qfalse;
} }
if ( com_token[0] != '{' ) { if ( com_token[0] != '{' ) {
ri.Printf( PRINT_ALL, "R_ParseSpawnVars: found %s when expecting {",com_token ); ri.Printf( PRINT_ALL, "R_ParseSpawnVars: found %s when expecting {\n",com_token );
return qfalse;
} }
// go through all the key / value pairs // go through all the key / value pairs
@ -2758,7 +2759,8 @@ qboolean R_ParseSpawnVars( char *spawnVarChars, int maxSpawnVarChars, int *numSp
// parse key // parse key
if ( !R_GetEntityToken( keyname, sizeof( keyname ) ) ) { if ( !R_GetEntityToken( keyname, sizeof( keyname ) ) ) {
ri.Printf( PRINT_ALL, "R_ParseSpawnVars: EOF without closing brace" ); ri.Printf( PRINT_ALL, "R_ParseSpawnVars: EOF without closing brace\n" );
return qfalse;
} }
if ( keyname[0] == '}' ) { if ( keyname[0] == '}' ) {
@ -2767,18 +2769,18 @@ qboolean R_ParseSpawnVars( char *spawnVarChars, int maxSpawnVarChars, int *numSp
// parse value // parse value
if ( !R_GetEntityToken( com_token, sizeof( com_token ) ) ) { if ( !R_GetEntityToken( com_token, sizeof( com_token ) ) ) {
ri.Printf( PRINT_ALL, "R_ParseSpawnVars: EOF without closing brace" ); ri.Printf( PRINT_ALL, "R_ParseSpawnVars: EOF without closing brace\n" );
break; return qfalse;
} }
if ( com_token[0] == '}' ) { if ( com_token[0] == '}' ) {
ri.Printf( PRINT_ALL, "R_ParseSpawnVars: closing brace without data" ); ri.Printf( PRINT_ALL, "R_ParseSpawnVars: closing brace without data\n" );
break; return qfalse;
} }
if ( *numSpawnVars == MAX_SPAWN_VARS ) { if ( *numSpawnVars == MAX_SPAWN_VARS ) {
ri.Printf( PRINT_ALL, "R_ParseSpawnVars: MAX_SPAWN_VARS" ); ri.Printf( PRINT_ALL, "R_ParseSpawnVars: MAX_SPAWN_VARS\n" );
break; return qfalse;
} }
keyLength = strlen(keyname) + 1; keyLength = strlen(keyname) + 1;
@ -2786,8 +2788,8 @@ qboolean R_ParseSpawnVars( char *spawnVarChars, int maxSpawnVarChars, int *numSp
if (numSpawnVarChars + keyLength + tokenLength > maxSpawnVarChars) if (numSpawnVarChars + keyLength + tokenLength > maxSpawnVarChars)
{ {
ri.Printf( PRINT_ALL, "R_ParseSpawnVars: MAX_SPAWN_VAR_CHARS" ); ri.Printf( PRINT_ALL, "R_ParseSpawnVars: MAX_SPAWN_VAR_CHARS\n" );
break; return qfalse;
} }
strcpy(spawnVarChars + numSpawnVarChars, keyname); strcpy(spawnVarChars + numSpawnVarChars, keyname);