ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2025-01-18 21:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Check for invalid filename in OpenAL's RegisterSound function.

Browse source 
- Changed Base sound system to warn not error when sound filename is empty or too long.
This commit is contained in:
Zack Middleton 2012-11-19 00:40:03 +00:00
parent 6c1045a003
commit 3da8779180
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/client/snd_dma.c
View file

@ -258,14 +258,17 @@ static sfx_t *S_FindName( const char *name ) {
sfx_t *sfx; sfx_t *sfx;
if (!name) { if (!name) {
Com_Error (ERR_FATAL, "S_FindName: NULL"); Com_Error(ERR_FATAL, "Sound name is NULL");
} }
if (!name[0]) { if (!name[0]) {
Com_Error (ERR_FATAL, "S_FindName: empty name"); Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is empty\n" );
return NULL;
} }
if (strlen(name) >= MAX_QPATH) { if (strlen(name) >= MAX_QPATH) {
Com_Error (ERR_FATAL, "Sound name too long: %s", name); Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is too long: %s\n", name );
return NULL;
} }
hash = S_HashSFXName(name); hash = S_HashSFXName(name);
@ -351,12 +354,11 @@ sfxHandle_t S_Base_RegisterSound( const char *name, qboolean compressed ) {
return 0; return 0;
} }
if ( strlen( name ) >= MAX_QPATH ) { sfx = S_FindName( name );
Com_Printf( "Sound name exceeds MAX_QPATH\n" ); if ( !sfx ) {
return 0; return 0;
} }
sfx = S_FindName( name );
if ( sfx->soundData ) { if ( sfx->soundData ) {
if ( sfx->defaultSound ) { if ( sfx->defaultSound ) {
Com_Printf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName ); Com_Printf( S_COLOR_YELLOW "WARNING: could not find %s - using default\n", sfx->soundName );

14
code/client/snd_openal.c
View file

@ -194,6 +194,20 @@ static sfxHandle_t S_AL_BufferFind(const char *filename)
sfxHandle_t sfx = -1; sfxHandle_t sfx = -1;
int i; int i;
if ( !filename ) {
Com_Error( ERR_FATAL, "Sound name is NULL" );
}
if ( !filename[0] ) {
Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is empty\n" );
return 0;
}
if ( strlen( filename ) >= MAX_QPATH ) {
Com_Printf( S_COLOR_YELLOW "WARNING: Sound name is too long: %s\n", filename );
return 0;
}
for(i = 0; i < numSfx; i++) for(i = 0; i < numSfx; i++)
{ {
if(!Q_stricmp(knownSfx[i].filename, filename)) if(!Q_stricmp(knownSfx[i].filename, filename))