From a7389070c1c77ed83d8f3c850267e2bc8b398209 Mon Sep 17 00:00:00 2001
From: "M. Kristall" <mkpdev@gmail.com>
Date: Tue, 29 Dec 2009 17:40:26 +0000
Subject: * Remove unnecessary security code introduced from ioq3 merge

---
 src/game/g_cmds.c      |  2 +-
 src/qcommon/cmd.c      | 16 ----------------
 src/qcommon/qcommon.h  |  1 -
 src/server/sv_client.c |  1 -
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index d2bf150e..6ee9bf7b 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -696,7 +696,7 @@ static qboolean G_SayTo( gentity_t *ent, gentity_t *other, saymode_t mode, const
       return qfalse;
   }
 
-  trap_SendServerCommand( other-g_entities, va( "chat %d %d\"%s\"",
+  trap_SendServerCommand( other-g_entities, va( "chat %d %d \"%s\"",
     ent ? ent-g_entities : -1,
     mode,
     message ) );
diff --git a/src/qcommon/cmd.c b/src/qcommon/cmd.c
index 80e991cd..7ce50ccc 100644
--- a/src/qcommon/cmd.c
+++ b/src/qcommon/cmd.c
@@ -469,22 +469,6 @@ char *Cmd_Cmd(void)
 	return cmd.cmd;
 }
 
-/*
-   Replace command separators with space to prevent interpretation
-   This is a hack to protect buggy qvms
-   https://bugzilla.icculus.org/show_bug.cgi?id=3593
-*/
-void Cmd_Args_Sanitize( void ) {
-	int i;
-	for ( i = 1 ; i < cmd.argc ; i++ ) {
-		char* c = cmd.argv[i];
-		while ((c = strpbrk(c, "\n\r;"))) {
-			*c = ' ';
-			++c;
-		}
-	}
-}
-
 /*
 ============
 Cmd_TokenizeString
diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h
index d7184d80..18f4c5e5 100644
--- a/src/qcommon/qcommon.h
+++ b/src/qcommon/qcommon.h
@@ -431,7 +431,6 @@ char	*Cmd_ArgsFrom( int arg );
 void	Cmd_ArgsBuffer( char *buffer, int bufferLength );
 void	Cmd_LiteralArgsBuffer( char *buffer, int bufferLength );
 char	*Cmd_Cmd (void);
-void	Cmd_Args_Sanitize( void );
 // The functions that execute commands get their parameters with these
 // functions. Cmd_Argv () will return an empty string, not a NULL
 // if arg > argc, so string operations are allways safe.
diff --git a/src/server/sv_client.c b/src/server/sv_client.c
index 9410f162..1448822c 100644
--- a/src/server/sv_client.c
+++ b/src/server/sv_client.c
@@ -1273,7 +1273,6 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
 	if (clientOK) {
 		// pass unknown strings to the game
 		if (!u->name && sv.state == SS_GAME) {
-			Cmd_Args_Sanitize();
 			VM_Call( gvm, GAME_CLIENT_COMMAND, cl - svs.clients );
 		}
 	}
-- 
cgit