[pcgen-commit-svn] SF.net SVN: pcgen: [1996] Trunk/pcgen/code/src/java/pcgen

[<jde...@us...>]

Revision: 1996
          http://svn.sourceforge.net/pcgen/?rev=1996&view=rev
Author:   jdempsey
Date:     2007-01-20 21:04:12 -0800 (Sat, 20 Jan 2007)

Log Message:
-----------
Add range checking to avoid crashes during exporting

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/GameMode.java
    Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
    Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AbilityToken.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/GameMode.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/GameMode.java	2007-01-21 05:02:54 UTC (rev 1995)
+++ Trunk/pcgen/code/src/java/pcgen/core/GameMode.java	2007-01-21 05:04:12 UTC (rev 1996)
@@ -1807,6 +1807,10 @@
 	 */
 	public String getCheckKey( final int anIndex )
 	{
+		if (anIndex < 0 || anIndex >= checkList.size())
+		{
+			return "";
+		}
 		return checkList.get(anIndex).getKeyName();
 	}
 	

Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2007-01-21 05:02:54 UTC (rev 1995)
+++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java	2007-01-21 05:04:12 UTC (rev 1996)
@@ -4750,8 +4750,9 @@
 		Map<String, String> totalLvlMap = null;
 		final Map<String, String> classLvlMap;
 
-		if (checkInd < SettingsHandler.getGame().getUnmodifiableCheckList()
-			.size())
+		if (checkInd >= 0
+			&& checkInd < SettingsHandler.getGame().getUnmodifiableCheckList()
+				.size())
 		{
 			totalClassLevels = getTotalCharacterLevel();
 			if (totalClassLevels > SettingsHandler.getGame().getChecksMaxLvl())

Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AbilityToken.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AbilityToken.java	2007-01-21 05:02:54 UTC (rev 1995)
+++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/AbilityToken.java	2007-01-21 05:04:12 UTC (rev 1996)
@@ -302,7 +302,7 @@
 	{
 		String retString = "";
 		Ability aAbility;
-		if (abilityIndex < aList.size())
+		if (abilityIndex >= 0 && abilityIndex < aList.size())
 		{
 			aAbility = aList.get(abilityIndex);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.