r4770 - in trunk/data/qcsrc: common server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-16 09:51:55 -0400 (Thu, 16 Oct 2008)
New Revision: 4770

Modified:
   trunk/data/qcsrc/common/util.qc
   trunk/data/qcsrc/server/vote.qc
Log:
undo the last change, instead make argv force a tempstring to be returned to fix this once and for all


Modified: trunk/data/qcsrc/common/util.qc
===================================================================
--- trunk/data/qcsrc/common/util.qc	2008-10-16 13:48:07 UTC (rev 4769)
+++ trunk/data/qcsrc/common/util.qc	2008-10-16 13:51:55 UTC (rev 4770)
@@ -921,7 +921,7 @@
 	// Perl-ish -1 for the last argument
 	if(i < 0)
 		i = _argc_sane + i;
-	return _argv_sane_buffer[i];
+	return strcat("", _argv_sane_buffer[i]); // force tempstring
 }
 
 float _argv_start_index_sane(float i)

Modified: trunk/data/qcsrc/server/vote.qc
===================================================================
--- trunk/data/qcsrc/server/vote.qc	2008-10-16 13:48:07 UTC (rev 4769)
+++ trunk/data/qcsrc/server/vote.qc	2008-10-16 13:51:55 UTC (rev 4770)
@@ -66,7 +66,7 @@
 	entity victim;
 	vote_argc = tokenize_sane(vote);
 
-	if(!VoteAllowed(strcat1(argv(0))))
+	if(!VoteAllowed(argv(0)))
 	{
 		return FALSE;
 	}