Fix for bug 46987 - allow RecordFactory to handle non-zero padding at the end of the workbook stream
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@765866 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
10ee56f313
commit
f41239ad03
@ -37,6 +37,7 @@
|
|||||||
|
|
||||||
<!-- Don't forget to update status.xml too! -->
|
<!-- Don't forget to update status.xml too! -->
|
||||||
<release version="3.5-beta6" date="2009-??-??">
|
<release version="3.5-beta6" date="2009-??-??">
|
||||||
|
<action dev="POI-DEVELOPERS" type="fix">46987 - Allow RecordFactory to handle non-zero padding at the end of the workbook stream</action>
|
||||||
<action dev="POI-DEVELOPERS" type="fix">47034 - Fix reading the name of a NameRecord when the name is very long</action>
|
<action dev="POI-DEVELOPERS" type="fix">47034 - Fix reading the name of a NameRecord when the name is very long</action>
|
||||||
<action dev="POI-DEVELOPERS" type="fix">47001 - Fixed WriteAccessRecord and LinkTable to handle unusual format written by Google Docs</action>
|
<action dev="POI-DEVELOPERS" type="fix">47001 - Fixed WriteAccessRecord and LinkTable to handle unusual format written by Google Docs</action>
|
||||||
<action dev="POI-DEVELOPERS" type="fix">46973 - Fixed defined names to behave better when refersToFormula is unset</action>
|
<action dev="POI-DEVELOPERS" type="fix">46973 - Fixed defined names to behave better when refersToFormula is unset</action>
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
<!-- Don't forget to update changes.xml too! -->
|
<!-- Don't forget to update changes.xml too! -->
|
||||||
<changes>
|
<changes>
|
||||||
<release version="3.5-beta6" date="2009-??-??">
|
<release version="3.5-beta6" date="2009-??-??">
|
||||||
|
<action dev="POI-DEVELOPERS" type="fix">46987 - Allow RecordFactory to handle non-zero padding at the end of the workbook stream</action>
|
||||||
<action dev="POI-DEVELOPERS" type="fix">47034 - Fix reading the name of a NameRecord when the name is very long</action>
|
<action dev="POI-DEVELOPERS" type="fix">47034 - Fix reading the name of a NameRecord when the name is very long</action>
|
||||||
<action dev="POI-DEVELOPERS" type="fix">47001 - Fixed WriteAccessRecord and LinkTable to handle unusual format written by Google Docs</action>
|
<action dev="POI-DEVELOPERS" type="fix">47001 - Fixed WriteAccessRecord and LinkTable to handle unusual format written by Google Docs</action>
|
||||||
<action dev="POI-DEVELOPERS" type="fix">46973 - Fixed defined names to behave better when refersToFormula is unset</action>
|
<action dev="POI-DEVELOPERS" type="fix">46973 - Fixed defined names to behave better when refersToFormula is unset</action>
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
package org.apache.poi.hssf.record;
|
package org.apache.poi.hssf.record;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.lang.reflect.Constructor;
|
import java.lang.reflect.Constructor;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
@ -32,6 +33,7 @@ import java.util.Set;
|
|||||||
|
|
||||||
import org.apache.poi.hssf.record.chart.*;
|
import org.apache.poi.hssf.record.chart.*;
|
||||||
import org.apache.poi.hssf.record.pivottable.*;
|
import org.apache.poi.hssf.record.pivottable.*;
|
||||||
|
import org.apache.poi.util.HexDump;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Title: Record Factory<P>
|
* Title: Record Factory<P>
|
||||||
@ -348,6 +350,22 @@ public final class RecordFactory {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void checkZeros(InputStream in, int avail) throws IOException {
|
||||||
|
int count=0;
|
||||||
|
while(true) {
|
||||||
|
int b = in.read();
|
||||||
|
if (b < 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (b!=0) {
|
||||||
|
System.err.print(HexDump.byteToHex(b));
|
||||||
|
}
|
||||||
|
count++;
|
||||||
|
}
|
||||||
|
if (avail != count) {
|
||||||
|
System.err.println("avail!=count (" + avail + "!=" + count + ").");
|
||||||
|
}
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Create an array of records from an input stream
|
* Create an array of records from an input stream
|
||||||
*
|
*
|
||||||
@ -364,13 +382,47 @@ public final class RecordFactory {
|
|||||||
RecordInputStream recStream = new RecordInputStream(in);
|
RecordInputStream recStream = new RecordInputStream(in);
|
||||||
DrawingRecord lastDrawingRecord = new DrawingRecord( );
|
DrawingRecord lastDrawingRecord = new DrawingRecord( );
|
||||||
Record lastRecord = null;
|
Record lastRecord = null;
|
||||||
|
/*
|
||||||
|
* How to recognise end of stream?
|
||||||
|
* In the best case, the underlying input stream (in) ends just after the last EOF record
|
||||||
|
* Usually however, the stream is padded with an arbitrary byte count. Excel and most apps
|
||||||
|
* reliably use zeros for padding and if this were always the case, this code could just
|
||||||
|
* skip all the (zero sized) records with sid==0. However, bug 46987 shows a file with
|
||||||
|
* non-zero padding that is read OK by Excel (Excel also fixes the padding).
|
||||||
|
*
|
||||||
|
* So to properly detect the workbook end of stream, this code has to identify the last
|
||||||
|
* EOF record. This is not so easy because the worbook bof+eof pair do not bracket the
|
||||||
|
* whole stream. The worksheets follow the workbook, but it is not easy to tell how many
|
||||||
|
* sheet sub-streams should be present. Hence we are looking for an EOF record that is not
|
||||||
|
* immediately followed by a BOF record. One extra complication is that bof+eof sub-
|
||||||
|
* streams can be nested within worksheet streams and it's not clear in these cases what
|
||||||
|
* record might follow any EOF record. So we also need to keep track of the bof/eof
|
||||||
|
* nesting level.
|
||||||
|
*/
|
||||||
|
|
||||||
|
int bofDepth=0;
|
||||||
|
boolean lastRecordWasEOFLevelZero = false;
|
||||||
while (recStream.hasNextRecord()) {
|
while (recStream.hasNextRecord()) {
|
||||||
recStream.nextRecord();
|
recStream.nextRecord();
|
||||||
if (recStream.getSid() == 0) {
|
if (lastRecordWasEOFLevelZero && recStream.getSid() != BOFRecord.sid) {
|
||||||
// After EOF, Excel seems to pad block with zeros
|
// Normally InputStream (in) contains only zero padding after this point
|
||||||
continue;
|
break;
|
||||||
}
|
}
|
||||||
Record record = createSingleRecord(recStream);
|
Record record = createSingleRecord(recStream);
|
||||||
|
lastRecordWasEOFLevelZero = false;
|
||||||
|
if (record instanceof BOFRecord) {
|
||||||
|
bofDepth++;
|
||||||
|
records.add(record);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (record instanceof EOFRecord) {
|
||||||
|
bofDepth--;
|
||||||
|
records.add(record);
|
||||||
|
if (bofDepth<1) {
|
||||||
|
lastRecordWasEOFLevelZero = true;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (record instanceof DBCellRecord) {
|
if (record instanceof DBCellRecord) {
|
||||||
// Not needed by POI. Regenerated from scratch by POI when spreadsheet is written
|
// Not needed by POI. Regenerated from scratch by POI when spreadsheet is written
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
(the "License"); you may not use this file except in compliance with
|
(the "License"); you may not use this file except in compliance with
|
||||||
the License. You may obtain a copy of the License at
|
the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
Unless required by applicable law or agreed to in writing, software
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
@ -19,11 +19,16 @@ package org.apache.poi.hssf.record;
|
|||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.util.List;
|
import java.io.IOException;
|
||||||
import java.util.Iterator;
|
import java.io.InputStream;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import junit.framework.AssertionFailedError;
|
||||||
import junit.framework.TestCase;
|
import junit.framework.TestCase;
|
||||||
|
|
||||||
|
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
|
||||||
import org.apache.poi.util.HexRead;
|
import org.apache.poi.util.HexRead;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -35,173 +40,215 @@ import org.apache.poi.util.HexRead;
|
|||||||
public final class TestRecordFactory extends TestCase {
|
public final class TestRecordFactory extends TestCase {
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TEST NAME: Test Basic Record Construction <P>
|
* TEST NAME: Test Basic Record Construction <P>
|
||||||
* OBJECTIVE: Test that the RecordFactory given the required parameters for know
|
* OBJECTIVE: Test that the RecordFactory given the required parameters for know
|
||||||
* record types can construct the proper record w/values.<P>
|
* record types can construct the proper record w/values.<P>
|
||||||
* SUCCESS: Record factory creates the records with the expected values.<P>
|
* SUCCESS: Record factory creates the records with the expected values.<P>
|
||||||
* FAILURE: The wrong records are creates or contain the wrong values <P>
|
* FAILURE: The wrong records are creates or contain the wrong values <P>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public void testBasicRecordConstruction() {
|
public void testBasicRecordConstruction() {
|
||||||
short recType = BOFRecord.sid;
|
short recType = BOFRecord.sid;
|
||||||
byte[] data = {
|
byte[] data = {
|
||||||
0, 6, 5, 0, -2, 28, -51, 7, -55, 64, 0, 0, 6, 1, 0, 0
|
0, 6, 5, 0, -2, 28, -51, 7, -55, 64, 0, 0, 6, 1, 0, 0
|
||||||
};
|
};
|
||||||
Record[] record = RecordFactory.createRecord(TestcaseRecordInputStream.create(recType, data));
|
Record[] record = RecordFactory.createRecord(TestcaseRecordInputStream.create(recType, data));
|
||||||
|
|
||||||
assertEquals(BOFRecord.class.getName(),
|
assertEquals(BOFRecord.class.getName(),
|
||||||
record[ 0 ].getClass().getName());
|
record[ 0 ].getClass().getName());
|
||||||
BOFRecord bofRecord = ( BOFRecord ) record[ 0 ];
|
BOFRecord bofRecord = ( BOFRecord ) record[ 0 ];
|
||||||
|
|
||||||
assertEquals(7422, bofRecord.getBuild());
|
assertEquals(7422, bofRecord.getBuild());
|
||||||
assertEquals(1997, bofRecord.getBuildYear());
|
assertEquals(1997, bofRecord.getBuildYear());
|
||||||
assertEquals(16585, bofRecord.getHistoryBitMask());
|
assertEquals(16585, bofRecord.getHistoryBitMask());
|
||||||
assertEquals(20, bofRecord.getRecordSize());
|
assertEquals(20, bofRecord.getRecordSize());
|
||||||
assertEquals(262, bofRecord.getRequiredVersion());
|
assertEquals(262, bofRecord.getRequiredVersion());
|
||||||
assertEquals(2057, bofRecord.getSid());
|
assertEquals(2057, bofRecord.getSid());
|
||||||
assertEquals(5, bofRecord.getType());
|
assertEquals(5, bofRecord.getType());
|
||||||
assertEquals(1536, bofRecord.getVersion());
|
assertEquals(1536, bofRecord.getVersion());
|
||||||
recType = MMSRecord.sid;
|
recType = MMSRecord.sid;
|
||||||
data = new byte[]
|
data = new byte[] {
|
||||||
{
|
0, 0
|
||||||
0, 0
|
};
|
||||||
};
|
record = RecordFactory.createRecord(TestcaseRecordInputStream.create(recType, data));
|
||||||
record = RecordFactory.createRecord(TestcaseRecordInputStream.create(recType, data));
|
assertEquals(MMSRecord.class.getName(),
|
||||||
assertEquals(MMSRecord.class.getName(),
|
record[ 0 ].getClass().getName());
|
||||||
record[ 0 ].getClass().getName());
|
MMSRecord mmsRecord = ( MMSRecord ) record[ 0 ];
|
||||||
MMSRecord mmsRecord = ( MMSRecord ) record[ 0 ];
|
|
||||||
|
|
||||||
assertEquals(0, mmsRecord.getAddMenuCount());
|
assertEquals(0, mmsRecord.getAddMenuCount());
|
||||||
assertEquals(0, mmsRecord.getDelMenuCount());
|
assertEquals(0, mmsRecord.getDelMenuCount());
|
||||||
assertEquals(6, mmsRecord.getRecordSize());
|
assertEquals(6, mmsRecord.getRecordSize());
|
||||||
assertEquals(193, mmsRecord.getSid());
|
assertEquals(193, mmsRecord.getSid());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TEST NAME: Test Special Record Construction <P>
|
* TEST NAME: Test Special Record Construction <P>
|
||||||
* OBJECTIVE: Test that the RecordFactory given the required parameters for
|
* OBJECTIVE: Test that the RecordFactory given the required parameters for
|
||||||
* constructing a RKRecord will return a NumberRecord.<P>
|
* constructing a RKRecord will return a NumberRecord.<P>
|
||||||
* SUCCESS: Record factory creates the Number record with the expected values.<P>
|
* SUCCESS: Record factory creates the Number record with the expected values.<P>
|
||||||
* FAILURE: The wrong records are created or contain the wrong values <P>
|
* FAILURE: The wrong records are created or contain the wrong values <P>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public void testSpecial() {
|
public void testSpecial() {
|
||||||
short recType = RKRecord.sid;
|
short recType = RKRecord.sid;
|
||||||
byte[] data = {
|
byte[] data = {
|
||||||
0, 0, 0, 0, 21, 0, 0, 0, 0, 0
|
0, 0, 0, 0, 21, 0, 0, 0, 0, 0
|
||||||
};
|
};
|
||||||
Record[] record = RecordFactory.createRecord(TestcaseRecordInputStream.create(recType, data));
|
Record[] record = RecordFactory.createRecord(TestcaseRecordInputStream.create(recType, data));
|
||||||
|
|
||||||
assertEquals(NumberRecord.class.getName(),
|
assertEquals(NumberRecord.class.getName(),
|
||||||
record[ 0 ].getClass().getName());
|
record[ 0 ].getClass().getName());
|
||||||
NumberRecord numberRecord = ( NumberRecord ) record[ 0 ];
|
NumberRecord numberRecord = ( NumberRecord ) record[ 0 ];
|
||||||
|
|
||||||
assertEquals(0, numberRecord.getColumn());
|
assertEquals(0, numberRecord.getColumn());
|
||||||
assertEquals(18, numberRecord.getRecordSize());
|
assertEquals(18, numberRecord.getRecordSize());
|
||||||
assertEquals(0, numberRecord.getRow());
|
assertEquals(0, numberRecord.getRow());
|
||||||
assertEquals(515, numberRecord.getSid());
|
assertEquals(515, numberRecord.getSid());
|
||||||
assertEquals(0.0, numberRecord.getValue(), 0.001);
|
assertEquals(0.0, numberRecord.getValue(), 0.001);
|
||||||
assertEquals(21, numberRecord.getXFIndex());
|
assertEquals(21, numberRecord.getXFIndex());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TEST NAME: Test Creating ContinueRecords After Unknown Records From An InputStream <P>
|
* TEST NAME: Test Creating ContinueRecords After Unknown Records From An InputStream <P>
|
||||||
* OBJECTIVE: Test that the RecordFactory given an InputStream
|
* OBJECTIVE: Test that the RecordFactory given an InputStream
|
||||||
* constructs the expected array of records.<P>
|
* constructs the expected array of records.<P>
|
||||||
* SUCCESS: Record factory creates the expected records.<P>
|
* SUCCESS: Record factory creates the expected records.<P>
|
||||||
* FAILURE: The wrong records are created or contain the wrong values <P>
|
* FAILURE: The wrong records are created or contain the wrong values <P>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public void testContinuedUnknownRecord() {
|
public void testContinuedUnknownRecord() {
|
||||||
byte[] data = {
|
byte[] data = {
|
||||||
0, -1, 0, 0, // an unknown record with 0 length
|
0, -1, 0, 0, // an unknown record with 0 length
|
||||||
0x3C , 0, 3, 0, 1, 2, 3, // a continuation record with 3 bytes of data
|
0x3C , 0, 3, 0, 1, 2, 3, // a continuation record with 3 bytes of data
|
||||||
0x3C , 0, 1, 0, 4 // one more continuation record with 1 byte of data
|
0x3C , 0, 1, 0, 4 // one more continuation record with 1 byte of data
|
||||||
};
|
};
|
||||||
|
|
||||||
ByteArrayInputStream bois = new ByteArrayInputStream(data);
|
ByteArrayInputStream bois = new ByteArrayInputStream(data);
|
||||||
Record[] records = (Record[])
|
Record[] records = (Record[])
|
||||||
RecordFactory.createRecords(bois).toArray(new Record[0]);
|
RecordFactory.createRecords(bois).toArray(new Record[0]);
|
||||||
assertEquals("Created record count", 3, records.length);
|
assertEquals("Created record count", 3, records.length);
|
||||||
assertEquals("1st record's type",
|
assertEquals("1st record's type",
|
||||||
UnknownRecord.class.getName(),
|
UnknownRecord.class.getName(),
|
||||||
records[ 0 ].getClass().getName());
|
records[ 0 ].getClass().getName());
|
||||||
assertEquals("1st record's sid", (short)-256, records[0].getSid());
|
assertEquals("1st record's sid", (short)-256, records[0].getSid());
|
||||||
assertEquals("2nd record's type",
|
assertEquals("2nd record's type",
|
||||||
ContinueRecord.class.getName(),
|
ContinueRecord.class.getName(),
|
||||||
records[ 1 ].getClass().getName());
|
records[ 1 ].getClass().getName());
|
||||||
ContinueRecord record = (ContinueRecord) records[1];
|
ContinueRecord record = (ContinueRecord) records[1];
|
||||||
assertEquals("2nd record's sid", 0x3C, record.getSid());
|
assertEquals("2nd record's sid", 0x3C, record.getSid());
|
||||||
assertEquals("1st data byte", 1, record.getData()[ 0 ]);
|
assertEquals("1st data byte", 1, record.getData()[ 0 ]);
|
||||||
assertEquals("2nd data byte", 2, record.getData()[ 1 ]);
|
assertEquals("2nd data byte", 2, record.getData()[ 1 ]);
|
||||||
assertEquals("3rd data byte", 3, record.getData()[ 2 ]);
|
assertEquals("3rd data byte", 3, record.getData()[ 2 ]);
|
||||||
assertEquals("3rd record's type",
|
assertEquals("3rd record's type",
|
||||||
ContinueRecord.class.getName(),
|
ContinueRecord.class.getName(),
|
||||||
records[ 2 ].getClass().getName());
|
records[ 2 ].getClass().getName());
|
||||||
record = (ContinueRecord) records[2];
|
record = (ContinueRecord) records[2];
|
||||||
assertEquals("3nd record's sid", 0x3C, record.getSid());
|
assertEquals("3nd record's sid", 0x3C, record.getSid());
|
||||||
assertEquals("4th data byte", 4, record.getData()[ 0 ]);
|
assertEquals("4th data byte", 4, record.getData()[ 0 ]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Drawing records have a very strange continue behaviour.
|
* Drawing records have a very strange continue behaviour.
|
||||||
* There can actually be OBJ records mixed between the continues.
|
* There can actually be OBJ records mixed between the continues.
|
||||||
* Record factory must preserve this structure when reading records.
|
* Record factory must preserve this structure when reading records.
|
||||||
*/
|
*/
|
||||||
public void testMixedContinue() throws Exception {
|
public void testMixedContinue() throws Exception {
|
||||||
/**
|
/**
|
||||||
* Adapted from a real test sample file 39512.xls (Offset 0x4854).
|
* Adapted from a real test sample file 39512.xls (Offset 0x4854).
|
||||||
* See Bug 39512 for details.
|
* See Bug 39512 for details.
|
||||||
*/
|
*/
|
||||||
String dump =
|
String dump =
|
||||||
//OBJ
|
//OBJ
|
||||||
"5D 00 48 00 15 00 12 00 0C 00 3C 00 11 00 A0 2E 03 01 CC 42 " +
|
"5D 00 48 00 15 00 12 00 0C 00 3C 00 11 00 A0 2E 03 01 CC 42 " +
|
||||||
"CF 00 00 00 00 00 0A 00 0C 00 00 00 00 00 00 00 00 00 00 00 " +
|
"CF 00 00 00 00 00 0A 00 0C 00 00 00 00 00 00 00 00 00 00 00 " +
|
||||||
"03 00 0B 00 06 00 28 01 03 01 00 00 12 00 08 00 00 00 00 00 " +
|
"03 00 0B 00 06 00 28 01 03 01 00 00 12 00 08 00 00 00 00 00 " +
|
||||||
"00 00 03 00 11 00 04 00 3D 00 00 00 00 00 00 00 " +
|
"00 00 03 00 11 00 04 00 3D 00 00 00 00 00 00 00 " +
|
||||||
//MSODRAWING
|
//MSODRAWING
|
||||||
"EC 00 08 00 00 00 0D F0 00 00 00 00 " +
|
"EC 00 08 00 00 00 0D F0 00 00 00 00 " +
|
||||||
//TXO (and 2 trailing CONTINUE records)
|
//TXO (and 2 trailing CONTINUE records)
|
||||||
"B6 01 12 00 22 02 00 00 00 00 00 00 00 00 10 00 10 00 00 00 00 00 " +
|
"B6 01 12 00 22 02 00 00 00 00 00 00 00 00 10 00 10 00 00 00 00 00 " +
|
||||||
"3C 00 11 00 00 4F 70 74 69 6F 6E 20 42 75 74 74 6F 6E 20 33 39 " +
|
"3C 00 11 00 00 4F 70 74 69 6F 6E 20 42 75 74 74 6F 6E 20 33 39 " +
|
||||||
"3C 00 10 00 00 00 05 00 00 00 00 00 10 00 00 00 00 00 00 00 " +
|
"3C 00 10 00 00 00 05 00 00 00 00 00 10 00 00 00 00 00 00 00 " +
|
||||||
// another CONTINUE
|
// another CONTINUE
|
||||||
"3C 00 7E 00 0F 00 04 F0 7E 00 00 00 92 0C 0A F0 08 00 00 00 " +
|
"3C 00 7E 00 0F 00 04 F0 7E 00 00 00 92 0C 0A F0 08 00 00 00 " +
|
||||||
"3D 04 00 00 00 0A 00 00 A3 00 0B F0 3C 00 00 00 7F 00 00 01 " +
|
"3D 04 00 00 00 0A 00 00 A3 00 0B F0 3C 00 00 00 7F 00 00 01 " +
|
||||||
"00 01 80 00 8C 01 03 01 85 00 01 00 00 00 8B 00 02 00 00 00 " +
|
"00 01 80 00 8C 01 03 01 85 00 01 00 00 00 8B 00 02 00 00 00 " +
|
||||||
"BF 00 08 00 1A 00 7F 01 29 00 29 00 81 01 41 00 00 08 BF 01 " +
|
"BF 00 08 00 1A 00 7F 01 29 00 29 00 81 01 41 00 00 08 BF 01 " +
|
||||||
"00 00 10 00 C0 01 40 00 00 08 FF 01 00 00 08 00 00 00 10 F0 " +
|
"00 00 10 00 C0 01 40 00 00 08 FF 01 00 00 08 00 00 00 10 F0 " +
|
||||||
"12 00 00 00 02 00 02 00 A0 03 18 00 B5 00 04 00 30 02 1A 00 " +
|
"12 00 00 00 02 00 02 00 A0 03 18 00 B5 00 04 00 30 02 1A 00 " +
|
||||||
"00 00 00 00 11 F0 00 00 00 00 " +
|
"00 00 00 00 11 F0 00 00 00 00 " +
|
||||||
//OBJ
|
//OBJ
|
||||||
"5D 00 48 00 15 00 12 00 0C 00 3D 00 11 00 8C 01 03 01 C8 59 CF 00 00 " +
|
"5D 00 48 00 15 00 12 00 0C 00 3D 00 11 00 8C 01 03 01 C8 59 CF 00 00 " +
|
||||||
"00 00 00 0A 00 0C 00 00 00 00 00 00 00 00 00 00 00 03 00 0B 00 06 00 " +
|
"00 00 00 0A 00 0C 00 00 00 00 00 00 00 00 00 00 00 03 00 0B 00 06 00 " +
|
||||||
"7C 16 03 01 00 00 12 00 08 00 00 00 00 00 00 00 03 00 11 00 04 00 01 " +
|
"7C 16 03 01 00 00 12 00 08 00 00 00 00 00 00 00 03 00 11 00 04 00 01 " +
|
||||||
"00 00 00 00 00 00 00";
|
"00 00 00 00 00 00 00";
|
||||||
byte[] data = HexRead.readFromString(dump);
|
byte[] data = HexRead.readFromString(dump);
|
||||||
|
|
||||||
List records = RecordFactory.createRecords(new ByteArrayInputStream(data));
|
List records = RecordFactory.createRecords(new ByteArrayInputStream(data));
|
||||||
assertEquals(5, records.size());
|
assertEquals(5, records.size());
|
||||||
assertTrue(records.get(0) instanceof ObjRecord);
|
assertTrue(records.get(0) instanceof ObjRecord);
|
||||||
assertTrue(records.get(1) instanceof DrawingRecord);
|
assertTrue(records.get(1) instanceof DrawingRecord);
|
||||||
assertTrue(records.get(2) instanceof TextObjectRecord);
|
assertTrue(records.get(2) instanceof TextObjectRecord);
|
||||||
assertTrue(records.get(3) instanceof ContinueRecord);
|
assertTrue(records.get(3) instanceof ContinueRecord);
|
||||||
assertTrue(records.get(4) instanceof ObjRecord);
|
assertTrue(records.get(4) instanceof ObjRecord);
|
||||||
|
|
||||||
//serialize and verify that the serialized data is the same as the original
|
//serialize and verify that the serialized data is the same as the original
|
||||||
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
ByteArrayOutputStream out = new ByteArrayOutputStream();
|
||||||
for(Iterator it = records.iterator(); it.hasNext(); ){
|
for(Iterator it = records.iterator(); it.hasNext(); ){
|
||||||
Record rec = (Record)it.next();
|
Record rec = (Record)it.next();
|
||||||
out.write(rec.serialize());
|
out.write(rec.serialize());
|
||||||
}
|
}
|
||||||
|
|
||||||
byte[] ser = out.toByteArray();
|
byte[] ser = out.toByteArray();
|
||||||
assertEquals(data.length, ser.length);
|
assertEquals(data.length, ser.length);
|
||||||
assertTrue(Arrays.equals(data, ser));
|
assertTrue(Arrays.equals(data, ser));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String [] ignored_args) {
|
public void testNonZeroPadding_bug46987() {
|
||||||
junit.textui.TestRunner.run(TestRecordFactory.class);
|
Record[] recs = {
|
||||||
}
|
new BOFRecord(),
|
||||||
|
EOFRecord.instance,
|
||||||
|
BOFRecord.createSheetBOF(),
|
||||||
|
EOFRecord.instance,
|
||||||
|
};
|
||||||
|
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||||
|
for (int i = 0; i < recs.length; i++) {
|
||||||
|
try {
|
||||||
|
baos.write(recs[i].serialize());
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//simulate the bad padding at the end of the workbook stream in attachment 23483 of bug 46987
|
||||||
|
baos.write(0x00);
|
||||||
|
baos.write(0x11);
|
||||||
|
baos.write(0x00);
|
||||||
|
baos.write(0x02);
|
||||||
|
for (int i = 0; i < 192; i++) {
|
||||||
|
baos.write(0x00);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
POIFSFileSystem fs = new POIFSFileSystem();
|
||||||
|
InputStream is;
|
||||||
|
try {
|
||||||
|
fs.createDocument(new ByteArrayInputStream(baos.toByteArray()), "dummy");
|
||||||
|
is = fs.getRoot().createDocumentInputStream("dummy");
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Record> outRecs;
|
||||||
|
try {
|
||||||
|
outRecs = RecordFactory.createRecords(is);
|
||||||
|
} catch (RuntimeException e) {
|
||||||
|
if (e.getMessage().equals("Buffer underrun - requested 512 bytes but 192 was available")) {
|
||||||
|
throw new AssertionFailedError("Identified bug 46987");
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
assertEquals(4, outRecs.size());
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user