From 594c81c3b5afe3dc976289adeee4c5b03c32a780 Mon Sep 17 00:00:00 2001 From: Spoike Date: Mon, 26 May 2008 21:50:11 +0000 Subject: [PATCH] Fixed voting to not crash the server when votes time out. Whoops. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2981 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/server/sv_user.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/engine/server/sv_user.c b/engine/server/sv_user.c index 0a78d23ce..076831b21 100644 --- a/engine/server/sv_user.c +++ b/engine/server/sv_user.c @@ -2930,7 +2930,7 @@ void VoteCheckTimes(void) { voteinfo_t *vote, *prev; prev = NULL; - for (vote = voteinfo; vote; vote = vote->next) + for (vote = voteinfo; vote; ) { if (vote->timeout < realtime) { @@ -2940,9 +2940,16 @@ void VoteCheckTimes(void) voteinfo = vote->next; Z_Free(vote); + + if (prev) + vote = prev; + else + vote = voteinfo; } else prev = vote; + + vote = vote->next; } }