quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix use after free (freed by realloc in EmitShader)

Browse Source
This commit is contained in:
Garux 2019-02-23 00:02:58 +03:00
parent 2dd78b7b97
commit 6680d394e8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/quake3/q3map2/lightmaps_ydnar.c
View File

@ -3512,7 +3512,9 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){
/* store it */ /* store it */
//% Sys_Printf( "Emitting: %s (%d", csi->shader, strlen( csi->shader ) ); //% Sys_Printf( "Emitting: %s (%d", csi->shader, strlen( csi->shader ) );
ds->shaderNum = EmitShader( csi->shader, &bspShaders[ ds->shaderNum ].contentFlags, &bspShaders[ ds->shaderNum ].surfaceFlags ); int cont = bspShaders[ ds->shaderNum ].contentFlags;
int surf = bspShaders[ ds->shaderNum ].surfaceFlags;
ds->shaderNum = EmitShader( csi->shader, &cont, &surf );
//% Sys_Printf( ")\n" ); //% Sys_Printf( ")\n" );
} }
@ -3530,13 +3532,17 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){
/* store it */ /* store it */
//% Sys_Printf( "Emitting: %s (%d", csi->shader, strlen( csi->shader ) ); //% Sys_Printf( "Emitting: %s (%d", csi->shader, strlen( csi->shader ) );
ds->shaderNum = EmitShader( csi->shader, &bspShaders[ ds->shaderNum ].contentFlags, &bspShaders[ ds->shaderNum ].surfaceFlags ); int cont = bspShaders[ ds->shaderNum ].contentFlags;
int surf = bspShaders[ ds->shaderNum ].surfaceFlags;
ds->shaderNum = EmitShader( csi->shader, &cont, &surf );
//% Sys_Printf( ")\n" ); //% Sys_Printf( ")\n" );
} }
/* use the normal plain-jane shader */ /* use the normal plain-jane shader */
else{ else{
ds->shaderNum = EmitShader( info->si->shader, &bspShaders[ ds->shaderNum ].contentFlags, &bspShaders[ ds->shaderNum ].surfaceFlags ); int cont = bspShaders[ ds->shaderNum ].contentFlags;
int surf = bspShaders[ ds->shaderNum ].surfaceFlags;
ds->shaderNum = EmitShader( info->si->shader, &cont, &surf );
} }
} }