From 3774c3228f58ed688118fc169ff4b35b94dd6f46 Mon Sep 17 00:00:00 2001 From: Josh Micich Date: Sat, 3 May 2008 20:13:56 +0000 Subject: [PATCH] Swapped ArrayIndexOutOfBoundsException for plain array length check in AbstractFunctionPtg.getParameterClass(). (To help debugging when trying to find a real AIOOB) git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@653125 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hssf/record/formula/AbstractFunctionPtg.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java b/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java index 82d85cceb..48d7d4cc5 100644 --- a/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java +++ b/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java @@ -147,10 +147,12 @@ public abstract class AbstractFunctionPtg extends OperationPtg { } public byte getParameterClass(int index) { - try { - return paramClass[index]; - } catch (ArrayIndexOutOfBoundsException aioobe) { + if (index >= paramClass.length) { + // For var-arg (and other?) functions, the metadata does not list all the parameter + // operand classes. In these cases, all extra parameters are assumed to have the + // same operand class as the last one specified. return paramClass[paramClass.length - 1]; } + return paramClass[index]; } }