From 6da44ba3d5497a30c1f5b13af38bc9fe991d06d2 Mon Sep 17 00:00:00 2001
From: /dev/humancontroller <devhc@example.com>
Date: Mon, 8 Jun 2015 14:41:57 +0200
Subject: remove the crappy "argument sanitization" workaround

---
 src/qcommon/cmd.c      | 25 -------------------------
 src/qcommon/qcommon.h  |  1 -
 src/server/sv_client.c |  1 -
 3 files changed, 27 deletions(-)

(limited to 'src')

diff --git a/src/qcommon/cmd.c b/src/qcommon/cmd.c
index 48489eff..7972d053 100644
--- a/src/qcommon/cmd.c
+++ b/src/qcommon/cmd.c
@@ -497,31 +497,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
-   https://bugzilla.icculus.org/show_bug.cgi?id=4769
-*/
-
-void Cmd_Args_Sanitize(void)
-{
-	int i;
-
-	for(i = 1; i < cmd.argc; i++)
-	{
-		char *c = cmd.argv[i];
-		
-		if(strlen(c) > MAX_CVAR_VALUE_STRING - 1)
-			c[MAX_CVAR_VALUE_STRING - 1] = '\0';
-		
-		while ((c = strpbrk(c, "\n\r;"))) {
-			*c = ' ';
-			++c;
-		}
-	}
-}
-
 /*
 ============
 Cmd_TokenizeString
diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h
index 567abe5f..b494773b 100644
--- a/src/qcommon/qcommon.h
+++ b/src/qcommon/qcommon.h
@@ -437,7 +437,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 dcf6311e..5a60a271 100644
--- a/src/server/sv_client.c
+++ b/src/server/sv_client.c
@@ -1319,7 +1319,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 && (cl->state == CS_ACTIVE || cl->state == CS_PRIMED)) {
-			Cmd_Args_Sanitize();
 			VM_Call( gvm, GAME_CLIENT_COMMAND, cl - svs.clients );
 		}
 	}
-- 
cgit