Author: nick
Date: Mon Apr 23 03:45:49 2007
New Revision: 531419
URL: http://svn.apache.org/viewvc?view=rev&rev=531419
Log:
Detect, and report a meaningful error, if we come across an Office 2007 XML
document
Added:
jakarta/poi/trunk/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
(with props)
jakarta/poi/trunk/src/testcases/org/apache/poi/hssf/data/sample.xlsx
(with props)
jakarta/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java
(with props)
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
Added:
jakarta/poi/trunk/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java?view=auto&rev=531419
==============================================================================
---
jakarta/poi/trunk/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
(added)
+++
jakarta/poi/trunk/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
Mon Apr 23 03:45:49 2007
@@ -0,0 +1,36 @@
+
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+
+
+package org.apache.poi.poifs.filesystem;
+
+/**
+ * This exception is thrown when we try to open a file that's actually
+ * an Office 2007+ XML file, rather than an OLE2 file (which is what
+ * POI works with)
+ *
+ * @author Nick Burch
+ */
+
+public class OfficeXmlFileException extends IllegalArgumentException
+{
+ public OfficeXmlFileException(String s) {
+ super(s);
+ }
+}
Propchange:
jakarta/poi/trunk/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java?view=diff&rev=531419&r1=531418&r2=531419
==============================================================================
---
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
(original)
+++
jakarta/poi/trunk/src/java/org/apache/poi/poifs/storage/HeaderBlockReader.java
Mon Apr 23 03:45:49 2007
@@ -24,6 +24,7 @@
import java.util.*;
import org.apache.poi.poifs.common.POIFSConstants;
+import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.IntegerField;
import org.apache.poi.util.LittleEndian;
@@ -89,6 +90,13 @@
if (signature.get() != _signature)
{
+ // Is it one of the usual suspects?
+ if(_data[0] == 0x50 && _data[1] == 0x4b && _data[2] ==
0x03 &&
+ _data[3] == 0x04) {
+ throw new OfficeXmlFileException("The supplied
data appears to be in the Office 2007+ XML. POI only supports OLE2 Office
documents");
+ }
+
+ // Give a generic error
throw new IOException("Invalid header signature; read "
+ signature.get() + ", expected "
+ _signature);
Added: jakarta/poi/trunk/src/testcases/org/apache/poi/hssf/data/sample.xlsx
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/testcases/org/apache/poi/hssf/data/sample.xlsx?view=auto&rev=531419
==============================================================================
Binary file - no diff available.
Propchange: jakarta/poi/trunk/src/testcases/org/apache/poi/hssf/data/sample.xlsx
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
jakarta/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java
URL:
http://svn.apache.org/viewvc/jakarta/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java?view=auto&rev=531419
==============================================================================
---
jakarta/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java
(added)
+++
jakarta/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java
Mon Apr 23 03:45:49 2007
@@ -0,0 +1,50 @@
+
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+
+package org.apache.poi.poifs.filesystem;
+
+import junit.framework.TestCase;
+import java.io.*;
+
+/**
+ * Class to test that POIFS complains when given an Office 2007 XML document
+ *
+ * @author Marc Johnson
+ */
+
+public class TestOffice2007XMLException extends TestCase
+{
+ public String dirname;
+
+ public void setUp() {
+ dirname = System.getProperty("HSSF.testdata.path");
+ }
+
+ public void testXMLException() throws IOException
+ {
+ FileInputStream in = new FileInputStream(dirname +
"/sample.xlsx");
+
+ try {
+ new POIFSFileSystem(in);
+ fail();
+ } catch(OfficeXmlFileException e) {
+ // Good
+ }
+ }
+}
Propchange:
jakarta/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestOffice2007XMLException.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
Mailing List: http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/
