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

use safe string in GetIndexedShader

Browse Source 
fix custom shader overflow check
This commit is contained in:
Garux 2021-01-19 22:12:53 +03:00
parent c3437b7833
commit cbeccc7e3a
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/quake3/common/stringfixedsize.h
View File

@ -52,7 +52,7 @@ public:
} }
StringFixedSize& operator=( const char* string ){ StringFixedSize& operator=( const char* string ){
return (*this)( string ); return operator()( string );
} }
template<typename ... Args> template<typename ... Args>

4
tools/quake3/q3map2/shaders.cpp
View File

@ -519,8 +519,8 @@ shaderInfo_t *CustomShader( shaderInfo_t *si, const char *find, char *replace ){
} }
/* error check */ /* error check */
if ( ( strlen( mapName ) + 1 + 32 ) > MAX_QPATH ) { if ( ( strlen( mapName ) + 1 + 32 ) >= MAX_QPATH ) {
Error( "Custom shader name length (%d) exceeded. Shorten your map name.\n", MAX_QPATH ); Error( "Custom shader name length (%d) exceeded. Shorten your map name.\n", MAX_QPATH - 1 );
} }
/* do some bad find-replace */ /* do some bad find-replace */

13
tools/quake3/q3map2/surface.cpp
View File

@ -787,7 +787,6 @@ byte GetShaderIndexForPoint( indexMap_t *im, vec3_t eMins, vec3_t eMaxs, vec3_t
shaderInfo_t *GetIndexedShader( shaderInfo_t *parent, indexMap_t *im, int numPoints, byte *shaderIndexes ){ shaderInfo_t *GetIndexedShader( shaderInfo_t *parent, indexMap_t *im, int numPoints, byte *shaderIndexes ){
int i; int i;
byte minShaderIndex, maxShaderIndex; byte minShaderIndex, maxShaderIndex;
char shader[ MAX_QPATH ];
shaderInfo_t *si; shaderInfo_t *si;
@ -821,16 +820,10 @@ shaderInfo_t *GetIndexedShader( shaderInfo_t *parent, indexMap_t *im, int numPoi
} }
} }
/* make a shader name */
if ( minShaderIndex == maxShaderIndex ) {
sprintf( shader, "textures/%s_%d", im->shader, maxShaderIndex );
}
else{
sprintf( shader, "textures/%s_%dto%d", im->shader, minShaderIndex, maxShaderIndex );
}
/* get the shader */ /* get the shader */
si = ShaderInfoForShader( shader ); si = ShaderInfoForShader( ( minShaderIndex == maxShaderIndex )?
String64()( "textures/", im->shader, '_', int(maxShaderIndex) ):
String64()( "textures/", im->shader, '_', int(minShaderIndex), "to", int(maxShaderIndex) ) );
/* inherit a few things from parent shader */ /* inherit a few things from parent shader */
if ( parent->globalTexture ) { if ( parent->globalTexture ) {