[iortcw] 368/497: All: Fix cgs.teamVoteString buffer overflow in CG_ConfigStringModified (unused)

Simon McVittie smcv at debian.org
Fri Sep 8 10:37:29 UTC 2017


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 359912d918113b2f6f7b08fdace1e79e7eda46ec
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Mon Jul 13 13:12:40 2015 -0400

    All: Fix cgs.teamVoteString buffer overflow in CG_ConfigStringModified (unused)
---
 MP/code/cgame/cg_servercmds.c | 2 +-
 SP/code/cgame/cg_servercmds.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/code/cgame/cg_servercmds.c b/MP/code/cgame/cg_servercmds.c
index 0021e9c..04f8868 100644
--- a/MP/code/cgame/cg_servercmds.c
+++ b/MP/code/cgame/cg_servercmds.c
@@ -407,7 +407,7 @@ static void CG_ConfigStringModified( void ) {
 		cgs.teamVoteNo[num - CS_TEAMVOTE_NO] = atoi( str );
 		cgs.teamVoteModified[num - CS_TEAMVOTE_NO] = qtrue;
 	} else if ( num >= CS_TEAMVOTE_STRING && num <= CS_TEAMVOTE_STRING + 1 ) {
-		Q_strncpyz( cgs.teamVoteString[num - CS_TEAMVOTE_STRING], str, sizeof( cgs.teamVoteString ) );
+		Q_strncpyz( cgs.teamVoteString[num - CS_TEAMVOTE_STRING], str, sizeof( cgs.teamVoteString[0] ) );
 		trap_S_StartLocalSound( cgs.media.voteNow, CHAN_ANNOUNCER );
 #endif
 	} else if ( num == CS_INTERMISSION ) {
diff --git a/SP/code/cgame/cg_servercmds.c b/SP/code/cgame/cg_servercmds.c
index 530ee08..529a998 100644
--- a/SP/code/cgame/cg_servercmds.c
+++ b/SP/code/cgame/cg_servercmds.c
@@ -436,7 +436,7 @@ static void CG_ConfigStringModified( void ) {
 		cgs.teamVoteNo[num - CS_TEAMVOTE_NO] = atoi( str );
 		cgs.teamVoteModified[num - CS_TEAMVOTE_NO] = qtrue;
 	} else if ( num >= CS_TEAMVOTE_STRING && num <= CS_TEAMVOTE_STRING + 1 ) {
-		Q_strncpyz( cgs.teamVoteString[num - CS_TEAMVOTE_STRING], str, sizeof( cgs.teamVoteString ) );
+		Q_strncpyz( cgs.teamVoteString[num - CS_TEAMVOTE_STRING], str, sizeof( cgs.teamVoteString[0] ) );
 		trap_S_StartLocalSound( cgs.media.voteNow, CHAN_ANNOUNCER );
 #endif
 	} else if ( num == CS_INTERMISSION ) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git



More information about the Pkg-games-commits mailing list