teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-27 06:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash caused by too many surfaces in skin

Browse source
This commit is contained in:
Zack Middleton 2013-09-04 20:36:45 -05:00
parent 61dd609aee
commit 27ddba9c2e
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/renderergl1/tr_image.c
View file

@ -1602,6 +1602,11 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// parse the shader name // parse the shader name
token = CommaParse( &text_p ); token = CommaParse( &text_p );
if ( skin->numSurfaces >= MD3_MAX_SURFACES ) {
ri.Printf( PRINT_WARNING, "WARNING: Ignoring surfaces in '%s', the max is %d surfaces!\n", name, MD3_MAX_SURFACES );
break;
}
surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low ); surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low );
Q_strncpyz( surf->name, surfName, sizeof( surf->name ) ); Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue ); surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue );

5
code/renderergl2/tr_image.c
View file

@ -3284,6 +3284,11 @@ qhandle_t RE_RegisterSkin( const char *name ) {
// parse the shader name // parse the shader name
token = CommaParse( &text_p ); token = CommaParse( &text_p );
if ( skin->numSurfaces >= MD3_MAX_SURFACES ) {
ri.Printf( PRINT_WARNING, "WARNING: Ignoring surfaces in '%s', the max is %d surfaces!\n", name, MD3_MAX_SURFACES );
break;
}
surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low ); surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_low );
Q_strncpyz( surf->name, surfName, sizeof( surf->name ) ); Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue ); surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue );