You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2014/11/30 18:09:04 UTC
svn commit: r1642568 - in /poi/trunk/src:
java/org/apache/poi/poifs/storage/HeaderBlock.java
testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
Author: nick
Date: Sun Nov 30 17:09:03 2014
New Revision: 1642568
URL: http://svn.apache.org/r1642568
Log:
Correct older biff detection, and add unit tests for HSSFWorkbook giving helpful exceptions on the older formats
Modified:
poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlock.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
Modified: poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlock.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlock.java?rev=1642568&r1=1642567&r2=1642568&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlock.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlock.java Sun Nov 30 17:09:03 2014
@@ -136,7 +136,7 @@ public final class HeaderBlock implement
if (_data[0] == 0x09 && _data[1] == 0x00 && // sid=0x0009
_data[2] == 0x04 && _data[3] == 0x00 && // size=0x0004
_data[4] == 0x00 && _data[5] == 0x00 && // unused
- (_data[6] == 0x01 || _data[6] == 0x02 || _data[6] == 0x04) &&
+ (_data[6] == 0x10 || _data[6] == 0x20 || _data[6] == 0x40) &&
_data[7] == 0x00) {
// BIFF2 raw stream
throw new OldExcelFormatException("The supplied data appears to be in BIFF2 format. " +
@@ -145,7 +145,7 @@ public final class HeaderBlock implement
if (_data[0] == 0x09 && _data[1] == 0x02 && // sid=0x0209
_data[2] == 0x06 && _data[3] == 0x00 && // size=0x0006
_data[4] == 0x00 && _data[5] == 0x00 && // unused
- (_data[6] == 0x01 || _data[6] == 0x02 || _data[6] == 0x04) &&
+ (_data[6] == 0x10 || _data[6] == 0x20 || _data[6] == 0x40) &&
_data[7] == 0x00) {
// BIFF3 raw stream
throw new OldExcelFormatException("The supplied data appears to be in BIFF3 format. " +
@@ -154,7 +154,7 @@ public final class HeaderBlock implement
if (_data[0] == 0x09 && _data[1] == 0x04 && // sid=0x0409
_data[2] == 0x06 && _data[3] == 0x00 && // size=0x0006
_data[4] == 0x00 && _data[5] == 0x00) { // unused
- if (((_data[6] == 0x01 || _data[6] == 0x02 || _data[6] == 0x04) &&
+ if (((_data[6] == 0x10 || _data[6] == 0x20 || _data[6] == 0x40) &&
_data[7] == 0x00) ||
(_data[6] == 0x00 && _data[7] == 0x01)) {
// BIFF4 raw stream
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java?rev=1642568&r1=1642567&r2=1642568&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java Sun Nov 30 17:09:03 2014
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.apache.poi.POITestCase.assertContains;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -40,6 +41,7 @@ import org.apache.poi.ddf.EscherBSERecor
import org.apache.poi.hpsf.ClassID;
import org.apache.poi.hssf.HSSFITestDataProvider;
import org.apache.poi.hssf.HSSFTestDataSamples;
+import org.apache.poi.hssf.OldExcelFormatException;
import org.apache.poi.hssf.model.HSSFFormulaParser;
import org.apache.poi.hssf.model.InternalSheet;
import org.apache.poi.hssf.model.InternalWorkbook;
@@ -561,6 +563,40 @@ public final class TestHSSFWorkbook exte
assertTrue(clsid1.equals(clsid2));
}
+
+ /**
+ * If we try to open an old (pre-97) workbook, we get a helpful
+ * Exception give to explain what we've done wrong
+ */
+ @Test
+ public void helpfulExceptionOnOldFiles() throws Exception {
+ InputStream excel4 = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("testEXCEL_4.xls");
+ try {
+ new HSSFWorkbook(excel4);
+ fail("Shouldn't be able to load an Excel 4 file");
+ } catch (OldExcelFormatException e) {
+ assertContains(e.getMessage(), "BIFF4");
+ }
+ excel4.close();
+
+ InputStream excel5 = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("testEXCEL_5.xls");
+ try {
+ new HSSFWorkbook(excel5);
+ fail("Shouldn't be able to load an Excel 5 file");
+ } catch (OldExcelFormatException e) {
+ assertContains(e.getMessage(), "BIFF5");
+ }
+ excel5.close();
+
+ InputStream excel95 = POIDataSamples.getSpreadSheetInstance().openResourceAsStream("testEXCEL_95.xls");
+ try {
+ new HSSFWorkbook(excel95);
+ fail("Shouldn't be able to load an Excel 95 file");
+ } catch (OldExcelFormatException e) {
+ assertContains(e.getMessage(), "BIFF5");
+ }
+ excel95.close();
+ }
/**
* Tests that we can work with both {@link POIFSFileSystem}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org