teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 14:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

include offending string in error message for varables that contain

Browse source 
blacklisted characters
This commit is contained in:
Ludwig Nussel 2006-12-30 12:13:25 +00:00
parent 91e54c01ed
commit 1bc190caf1
1 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
code/qcommon/q_shared.c
View file

@ -1187,29 +1187,21 @@ Changes or adds a key/value pair
*/ */
void Info_SetValueForKey( char *s, const char *key, const char *value ) { void Info_SetValueForKey( char *s, const char *key, const char *value ) {
char newi[MAX_INFO_STRING]; char newi[MAX_INFO_STRING];
const char* blacklist = "\\;\"";
if ( strlen( s ) >= MAX_INFO_STRING ) { if ( strlen( s ) >= MAX_INFO_STRING ) {
Com_Error( ERR_DROP, "Info_SetValueForKey: oversize infostring" ); Com_Error( ERR_DROP, "Info_SetValueForKey: oversize infostring" );
} }
if (strchr (key, '\\') || strchr (value, '\\')) for(; *blacklist; ++blacklist)
{ {
Com_Printf ("Can't use keys or values with a \\\n"); if (strchr (key, *blacklist) || strchr (value, *blacklist))
return; {
Com_Printf (S_COLOR_YELLOW "Can't use keys or values with a '%c': %s = %s\n", *blacklist, key, value);
return;
}
} }
if (strchr (key, ';') || strchr (value, ';'))
{
Com_Printf ("Can't use keys or values with a semicolon\n");
return;
}
if (strchr (key, '\"') || strchr (value, '\"'))
{
Com_Printf ("Can't use keys or values with a \"\n");
return;
}
Info_RemoveKey (s, key); Info_RemoveKey (s, key);
if (!value || !strlen(value)) if (!value || !strlen(value))
return; return;
@ -1235,27 +1227,19 @@ Changes or adds a key/value pair
*/ */
void Info_SetValueForKey_Big( char *s, const char *key, const char *value ) { void Info_SetValueForKey_Big( char *s, const char *key, const char *value ) {
char newi[BIG_INFO_STRING]; char newi[BIG_INFO_STRING];
const char* blacklist = "\\;\"";
if ( strlen( s ) >= BIG_INFO_STRING ) { if ( strlen( s ) >= BIG_INFO_STRING ) {
Com_Error( ERR_DROP, "Info_SetValueForKey: oversize infostring" ); Com_Error( ERR_DROP, "Info_SetValueForKey: oversize infostring" );
} }
if (strchr (key, '\\') || strchr (value, '\\')) for(; *blacklist; ++blacklist)
{ {
Com_Printf ("Can't use keys or values with a \\\n"); if (strchr (key, *blacklist) || strchr (value, *blacklist))
return; {
} Com_Printf (S_COLOR_YELLOW "Can't use keys or values with a '%c': %s = %s\n", *blacklist, key, value);
return;
if (strchr (key, ';') || strchr (value, ';')) }
{
Com_Printf ("Can't use keys or values with a semicolon\n");
return;
}
if (strchr (key, '\"') || strchr (value, '\"'))
{
Com_Printf ("Can't use keys or values with a \"\n");
return;
} }
Info_RemoveKey_Big (s, key); Info_RemoveKey_Big (s, key);