Author: centic
Date: Sun Feb 5 22:34:40 2017
New Revision: 1781822
URL: http://svn.apache.org/viewvc?rev=1781822&view=rev
Log:
Revert previous changes enough to restore the case in the commoncrawl-corpus
which is failing now, add a unit-test for this case, enable one disabled
unit-test
Added:
poi/trunk/test-data/document/ca.kwsymphony.www_education_School_Concert_Seat_Booking_Form_2011-12.doc
(with props)
Modified:
poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java
poi/trunk/src/java/org/apache/poi/ddf/EscherComplexProperty.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java?rev=1781822&r1=1781821&r2=1781822&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherArrayProperty.java Sun Feb 5
22:34:40 2017
@@ -24,7 +24,7 @@ import org.apache.poi.util.HexDump;
import org.apache.poi.util.LittleEndian;
/**
- * Escher array properties are the most wierd construction ever invented
+ * Escher array properties are the most weird construction ever invented
* with all sorts of special cases. I'm hopeful I've got them all.
*/
public final class EscherArrayProperty extends EscherComplexProperty
implements Iterable<byte[]> {
@@ -43,7 +43,7 @@ public final class EscherArrayProperty e
/**
* When reading a property from data stream remember if the complex part
is empty and set this flag.
*/
- private boolean emptyComplexPart = false;
+ private boolean emptyComplexPart;
public EscherArrayProperty(short id, byte[] complexData) {
super(id, checkComplexData(complexData));
@@ -67,9 +67,13 @@ public final class EscherArrayProperty e
}
public void setNumberOfElementsInArray(int numberOfElements) {
- int expectedArraySize = getArraySizeInBytes(numberOfElements,
getSizeOfElements());
- resizeComplexData(expectedArraySize, getComplexData().length);
- LittleEndian.putShort(getComplexData(), 0, (short)numberOfElements);
+ int expectedArraySize = numberOfElements *
getActualSizeOfElements(getSizeOfElements()) + FIXED_SIZE;
+ if (expectedArraySize != getComplexData().length) {
+ byte[] newArray = new byte[expectedArraySize];
+ System.arraycopy(getComplexData(), 0, newArray, 0,
getComplexData().length);
+ setComplexData(newArray);
+ }
+ LittleEndian.putShort(getComplexData(), 0, (short) numberOfElements);
}
public int getNumberOfElementsInMemory() {
@@ -77,8 +81,12 @@ public final class EscherArrayProperty e
}
public void setNumberOfElementsInMemory(int numberOfElements) {
- int expectedArraySize = getArraySizeInBytes(numberOfElements,
getSizeOfElements());
- resizeComplexData(expectedArraySize, expectedArraySize);
+ int expectedArraySize = numberOfElements *
getActualSizeOfElements(getSizeOfElements()) + FIXED_SIZE;
+ if (expectedArraySize != getComplexData().length) {
+ byte[] newArray = new byte[expectedArraySize];
+ System.arraycopy(getComplexData(), 0, newArray, 0,
expectedArraySize);
+ setComplexData(newArray);
+ }
LittleEndian.putShort(getComplexData(), 2, (short) numberOfElements);
}
@@ -89,9 +97,13 @@ public final class EscherArrayProperty e
public void setSizeOfElements(int sizeOfElements) {
LittleEndian.putShort( getComplexData(), 4, (short) sizeOfElements );
- int expectedArraySize =
getArraySizeInBytes(getNumberOfElementsInArray(), sizeOfElements);
- // Keep just the first 6 bytes. The rest is no good to us anyway.
- resizeComplexData(expectedArraySize, 6);
+ int expectedArraySize = getNumberOfElementsInArray() *
getActualSizeOfElements(getSizeOfElements()) + FIXED_SIZE;
+ if (expectedArraySize != getComplexData().length) {
+ // Keep just the first 6 bytes. The rest is no good to us anyway.
+ byte[] newArray = new byte[expectedArraySize];
+ System.arraycopy( getComplexData(), 0, newArray, 0, 6 );
+ setComplexData(newArray);
+ }
}
public byte[] getElement(int index) {
@@ -108,13 +120,13 @@ public final class EscherArrayProperty e
@Override
public String toString() {
- StringBuffer results = new StringBuffer();
+ StringBuilder results = new StringBuilder();
results.append(" {EscherArrayProperty:" + '\n');
- results.append(" Num Elements: " + getNumberOfElementsInArray() +
'\n');
- results.append(" Num Elements In Memory: " +
getNumberOfElementsInMemory() + '\n');
- results.append(" Size of elements: " + getSizeOfElements() + '\n');
+ results.append(" Num Elements:
").append(getNumberOfElementsInArray()).append('\n');
+ results.append(" Num Elements In Memory:
").append(getNumberOfElementsInMemory()).append('\n');
+ results.append(" Size of elements:
").append(getSizeOfElements()).append('\n');
for (int i = 0; i < getNumberOfElementsInArray(); i++) {
- results.append(" Element " + i + ": " +
HexDump.toHex(getElement(i)) + '\n');
+ results.append(" Element ").append(i).append(":
").append(HexDump.toHex(getElement(i))).append('\n');
}
results.append("}" + '\n');
@@ -150,25 +162,23 @@ public final class EscherArrayProperty e
*/
public int setArrayData(byte[] data, int offset) {
if (emptyComplexPart){
- resizeComplexData(0, 0);
- return 0;
+ setComplexData(new byte[0]);
+ } else {
+ short numElements = LittleEndian.getShort(data, offset);
+ // LittleEndian.getShort(data, offset + 2); // numReserved
+ short sizeOfElements = LittleEndian.getShort(data, offset + 4);
+
+ // the code here seems to depend on complexData already being
+ // sized correctly via the constructor
+ int arraySize = getActualSizeOfElements(sizeOfElements) *
numElements;
+ if (arraySize == getComplexData().length) {
+ // The stored data size in the simple block excludes the
header size
+ setComplexData(new byte[arraySize + 6]);
+ sizeIncludesHeaderSize = false;
+ }
+ System.arraycopy(data, offset, getComplexData(), 0,
getComplexData().length );
}
-
- short numElements = LittleEndian.getShort(data, offset);
- // LittleEndian.getShort(data, offset + 2); // numReserved
- short sizeOfElements = LittleEndian.getShort(data, offset + 4);
-
- // TODO: this part is strange - it doesn't make sense to compare
- // the size of the existing data when setting a new data array ...
- int arraySize = getArraySizeInBytes(numElements, sizeOfElements);
- if (arraySize - FIXED_SIZE == getComplexData().length) {
- // The stored data size in the simple block excludes the header
size
- sizeIncludesHeaderSize = false;
- }
- int cpySize = Math.min(arraySize, data.length-offset);
- resizeComplexData(cpySize, 0);
- System.arraycopy(data, offset, getComplexData(), 0, cpySize);
- return cpySize;
+ return getComplexData().length;
}
/**
@@ -199,15 +209,10 @@ public final class EscherArrayProperty e
return sizeOfElements;
}
- private static int getArraySizeInBytes(int numberOfElements, int
sizeOfElements) {
- return numberOfElements *
getActualSizeOfElements((short)(sizeOfElements & 0xFFFF)) + FIXED_SIZE;
- }
-
-
@Override
public Iterator<byte[]> iterator() {
return new Iterator<byte[]>(){
- private int idx = 0;
+ int idx;
@Override
public boolean hasNext() {
return (idx < getNumberOfElementsInArray());
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherComplexProperty.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherComplexProperty.java?rev=1781822&r1=1781821&r2=1781822&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherComplexProperty.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherComplexProperty.java Sun Feb 5
22:34:40 2017
@@ -28,7 +28,6 @@ import org.apache.poi.util.LittleEndian;
* stored here.
*/
public class EscherComplexProperty extends EscherProperty {
- // TODO - make private and final
private byte[] _complexData;
/**
@@ -88,23 +87,17 @@ public class EscherComplexProperty exten
/**
* Get the complex data value.
- *
+ *
* @return the complex bytes
*/
public byte[] getComplexData() {
return _complexData;
}
- protected void resizeComplexData(int newSize, int bytesToKeep) {
- if (newSize == _complexData.length) {
- return;
- }
- byte[] newArray = new byte[newSize];
- System.arraycopy(_complexData, 0, newArray, 0, Math.min(bytesToKeep,
newSize));
- _complexData = newArray;
+ protected void setComplexData(byte[] _complexData) {
+ this._complexData = _complexData;
}
-
-
+
/**
* Determine whether this property is equal to another property.
*
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java?rev=1781822&r1=1781821&r2=1781822&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
Sun Feb 5 22:34:40 2017
@@ -903,6 +903,7 @@ public class TestBugs{
assertEquals(section2NumColumns, section.getNumColumns());
}
+ @Test
public void testRegressionIn315beta2() {
HWPFDocument hwpfDocument =
HWPFTestDataSamples.openSampleFile("cap.stanford.edu_profiles_viewbiosketch_facultyid=4009&name=m_maciver.doc");
assertNotNull(hwpfDocument);
@@ -929,4 +930,10 @@ public class TestBugs{
fs.close();
}
}
+
+ @Test
+ public void testCommonCrawlRegression() throws IOException {
+ HWPFDocument document =
HWPFTestDataSamples.openSampleFile("ca.kwsymphony.www_education_School_Concert_Seat_Booking_Form_2011-12.doc");
+ document.close();
+ }
}
Added:
poi/trunk/test-data/document/ca.kwsymphony.www_education_School_Concert_Seat_Booking_Form_2011-12.doc
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/document/ca.kwsymphony.www_education_School_Concert_Seat_Booking_Form_2011-12.doc?rev=1781822&view=auto
==============================================================================
Binary files
poi/trunk/test-data/document/ca.kwsymphony.www_education_School_Concert_Seat_Booking_Form_2011-12.doc
(added) and
poi/trunk/test-data/document/ca.kwsymphony.www_education_School_Concert_Seat_Booking_Form_2011-12.doc
Sun Feb 5 22:34:40 2017 differ
Propchange:
poi/trunk/test-data/document/ca.kwsymphony.www_education_School_Concert_Seat_Booking_Form_2011-12.doc
------------------------------------------------------------------------------
svn:executable = *
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]