From eee3dc4671e3517bc7dd539682a94432c2e1fe5d Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Tue, 22 Jan 2008 23:44:10 +0000
Subject: * (bug 3412) %s expansion security patch (DevHC)

git-svn-id: svn://svn.icculus.org/quake3/trunk@1250 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/client/cl_cgame.c | 4 ++--
 code/client/cl_main.c  | 6 +++---
 code/client/cl_parse.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'code/client')

diff --git a/code/client/cl_cgame.c b/code/client/cl_cgame.c
index b2a3cc4..da9ac01 100644
--- a/code/client/cl_cgame.c
+++ b/code/client/cl_cgame.c
@@ -296,9 +296,9 @@ rescan:
 		// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=552
 		// allow server to indicate why they were disconnected
 		if ( argc >= 2 )
-			Com_Error (ERR_SERVERDISCONNECT, va( "Server Disconnected - %s", Cmd_Argv( 1 ) ) );
+			Com_Error( ERR_SERVERDISCONNECT, "Server disconnected - %s", Cmd_Argv( 1 ) );
 		else
-			Com_Error (ERR_SERVERDISCONNECT,"Server disconnected\n");
+			Com_Error( ERR_SERVERDISCONNECT, "Server disconnected\n" );
 	}
 
 	if ( !strcmp( cmd, "bcs0" ) ) {
diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 789d3b1..af2aab9 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -452,7 +452,7 @@ void CL_DemoCompleted( void )
 					time / (float)clc.timeDemoFrames,
 					clc.timeDemoMaxDuration,
 					CL_DemoFrameDurationSDev( ) );
-			Com_Printf( buffer );
+			Com_Printf( "%s", buffer );
 
 			// Write a log of all the frame durations
 			if( cl_timedemoLog && strlen( cl_timedemoLog->string ) > 0 )
@@ -1045,7 +1045,7 @@ void CL_RequestAuthorization( void ) {
 
 	fs = Cvar_Get ("cl_anonymous", "0", CVAR_INIT|CVAR_SYSTEMINFO );
 
-	NET_OutOfBandPrint(NS_CLIENT, cls.authorizeServer, va("getKeyAuthorize %i %s", fs->integer, nums) );
+	NET_OutOfBandPrint(NS_CLIENT, cls.authorizeServer, "getKeyAuthorize %i %s", fs->integer, nums );
 }
 
 /*
@@ -3293,7 +3293,7 @@ void CL_GlobalServers_f( void ) {
 	for (i=3; i<count; i++)
 		buffptr += sprintf( buffptr, " %s", Cmd_Argv(i) );
 
-	NET_OutOfBandPrint( NS_SERVER, to, command );
+	NET_OutOfBandPrint( NS_SERVER, to, "%s", command );
 }
 
 
diff --git a/code/client/cl_parse.c b/code/client/cl_parse.c
index 6bac6d0..72ae6ed 100644
--- a/code/client/cl_parse.c
+++ b/code/client/cl_parse.c
@@ -554,7 +554,7 @@ void CL_ParseDownload ( msg_t *msg ) {
 
 		if (clc.downloadSize < 0)
 		{
-			Com_Error(ERR_DROP, MSG_ReadString( msg ) );
+			Com_Error( ERR_DROP, "%s", MSG_ReadString( msg ) );
 			return;
 		}
 	}
-- 
cgit v1.2.3