From 80ac008f243198611db1b64a2aed6e1354b586d8 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Wed, 22 Jun 2005 19:59:51 +0000 Subject: [PATCH] Prevent array index bounds problems if isOccupiedPlayer gets called with -1 (I saw it happen entering a sword game as a watcher). git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3613 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/parlor/game/data/GameObject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/threerings/parlor/game/data/GameObject.java b/src/java/com/threerings/parlor/game/data/GameObject.java index 709b755c0..164b5f118 100644 --- a/src/java/com/threerings/parlor/game/data/GameObject.java +++ b/src/java/com/threerings/parlor/game/data/GameObject.java @@ -179,7 +179,7 @@ public class GameObject extends PlaceObject */ public boolean isOccupiedPlayer (int pidx) { - return (players[pidx] != null); + return (pidx >= 0 && pidx < players.length) && (players[pidx] != null); } /**