From: Andrew C. Oliver <acoliver@apache.org>
Date: Fri, 2 Mar 2007 03:48:55 +0000 (+0000)
Subject: fix amateur hour coding mistake
X-Git-Tag: REL_3_0_RC1~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=da9a6807d6650f637629bec1f471f5cff313047c;p=poi.git

fix amateur hour coding mistake


git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@513609 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
index b5525987b1..80b932c51c 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
+++ b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
@@ -214,9 +214,9 @@ public class ValueRecordsAggregate
 
     /** Returns true if the row has cells attached to it */
     public boolean rowHasCells(int row) {
-    	if (row > records.length)
-    		return false;
-      CellValueRecordInterface[] rowCells=records[row];
+    	if (row > records.length-1) //previously this said row > records.length which means if 
+    		return false;  // if records.length == 60 and I pass "60" here I get array out of bounds
+      CellValueRecordInterface[] rowCells=records[row]; //because a 60 length array has the last index = 59
       if(rowCells==null) return false;
       for(int col=0;col<rowCells.length;col++) {
         if(rowCells[col]!=null) return true;
@@ -334,7 +334,8 @@ public class ValueRecordsAggregate
     private void findNext() {
       nextColumn++;
       for(;nextRow<=lastRow;nextRow++) {
-        CellValueRecordInterface[] rowCells=records[nextRow];
+                                           //previously this threw array out of bounds...
+        CellValueRecordInterface[] rowCells=(nextRow < records.length) ? records[nextRow] : null;
         if(rowCells==null) { // This row is empty
           nextColumn=0;
           continue;
@@ -347,4 +348,4 @@ public class ValueRecordsAggregate
     }
 
   }
-}
\ No newline at end of file
+}