Fix NPOIFS to handle dodgy excel-95 file from bug #46904

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

diff --git a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
index 4ad5c0a5b1c32cab0154212a00bef52ab2ed402b..bb5b3a50ed42424fa99c45e489ac602ef32133af 100644 (file)
--- a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
+++ b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
@@ -436,7 +436,7 @@ public class NPOIFSFileSystem extends BlockStore
        List<BATBlock> sbats = new ArrayList<BATBlock>();
        _mini_store     = new NPOIFSMiniStore(this, _property_table.getRoot(), sbats, _header);
        nextAt = _header.getSBATStart();
-       for(int i=0; i<_header.getSBATCount(); i++) {
+       for(int i=0; i<_header.getSBATCount() && nextAt != POIFSConstants.END_OF_CHAIN; i++) {
           loopDetector.claim(nextAt);
           ByteBuffer fatData = getBlockAt(nextAt);
           sfat = BATBlock.createBATBlock(bigBlockSize, fatData);

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
index 36f397c01eb76565a003198881fb73f2f0c52ce4..df470f26cfb9d722153c8acfbf588bbcbb8001b8 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -1578,8 +1578,6 @@ public final class TestBugs extends BaseTestBugzillaIssues {
                     "The supplied spreadsheet seems to be Excel"
             ));
         }
-        // TODO Fix this to work with NPOIFS as well
-/*
         try {
             NPOIFSFileSystem fs = new NPOIFSFileSystem(
                     HSSFITestDataProvider.instance.openWorkbookStream("46904.xls"));
@@ -1590,7 +1588,6 @@ public final class TestBugs extends BaseTestBugzillaIssues {
                     "The supplied spreadsheet seems to be Excel"
             ));
         }
-*/
     }
 
     /**