r1494 - trunk/code/game

[DONOTREPLY at icculus.org]

Author: ludwig
Date: 2009-01-23 15:12:45 -0500 (Fri, 23 Jan 2009)
New Revision: 1494

Modified:
   trunk/code/game/g_combat.c
Log:
fix potential segfault (found by DerSaidin in xreal)

Modified: trunk/code/game/g_combat.c
===================================================================
--- trunk/code/game/g_combat.c	2009-01-17 23:09:58 UTC (rev 1493)
+++ trunk/code/game/g_combat.c	2009-01-23 20:12:45 UTC (rev 1494)
@@ -974,7 +974,8 @@
 	}
 
 	// add to the attacker's hit counter (if the target isn't a general entity like a prox mine)
-	if ( attacker->client && targ != attacker && targ->health > 0
+	if ( attacker->client && client
+			&& targ != attacker && targ->health > 0
 			&& targ->s.eType != ET_MISSILE
 			&& targ->s.eType != ET_GENERAL) {
 		if ( OnSameTeam( targ, attacker ) ) {