Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert 731 because of suspicious mem issues in ci-builds 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1922112 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2024-11-26 11:24:39 +00:00
parent 5874f55dcc
commit 6d56d81f35
2 changed files with 8 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
View File

@ -247,33 +247,20 @@ public class POIFSMiniStore extends BlockStore {
* based on full blocks used, not the data within the streams * based on full blocks used, not the data within the streams
*/ */
void syncWithDataSource() throws IOException { void syncWithDataSource() throws IOException {
int blocksUsed = 0;
for (BATBlock sbat : _sbat_blocks) { for (BATBlock sbat : _sbat_blocks) {
ByteBuffer block = _filesystem.getBlockAt(sbat.getOurBlockIndex()); ByteBuffer block = _filesystem.getBlockAt(sbat.getOurBlockIndex());
sbat.writeData(block); sbat.writeData(block);
}
// Set the size on the root in terms of the number of SBAT blocks if (!sbat.hasFreeSectors()) {
// RootProperty.setSize does the sbat -> bytes conversion for us blocksUsed += _filesystem.getBigBlockSizeDetails().getBATEntriesPerBlock();
_filesystem._get_property_table().getRoot().setSize(computeSize()); } else {
} blocksUsed += sbat.getOccupiedSize();
/**
* Computes the size of the mini-stream (in number of mini blocks). The trailing
* unallocated mini blocks are ignored, the others are counted as allocated. This
* behaviour was checked with MSI files signed with signtool.
*/
private int computeSize() {
int entriesPerBlock = _filesystem.getBigBlockSizeDetails().getBATEntriesPerBlock();
for (int sbatIndex = _sbat_blocks.size() - 1; sbatIndex >= 0; sbatIndex--) {
BATBlock sbat = _sbat_blocks.get(sbatIndex);
for (int miniBlockIndex = entriesPerBlock - 1; miniBlockIndex >= 0; miniBlockIndex--) {
if (sbat.getValueAt(miniBlockIndex) != POIFSConstants.UNUSED_BLOCK) {
return (sbatIndex * entriesPerBlock) + miniBlockIndex + 1;
}
} }
} }
// Set the size on the root in terms of the number of SBAT blocks
return 0; // RootProperty.setSize does the sbat -> bytes conversion for us
_filesystem._get_property_table().getRoot().setSize(blocksUsed);
} }
@Override @Override

65
poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java
View File

@ -28,9 +28,7 @@ import java.nio.ByteBuffer;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.apache.commons.io.output.NullOutputStream;
import org.apache.poi.POIDataSamples; import org.apache.poi.POIDataSamples;
import org.apache.poi.hpsf.ClassID;
import org.apache.poi.poifs.common.POIFSConstants; import org.apache.poi.poifs.common.POIFSConstants;
import org.apache.poi.util.IOUtils; import org.apache.poi.util.IOUtils;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -472,67 +470,4 @@ final class TestPOIFSMiniStore {
assertArrayEquals(data2B, r2); assertArrayEquals(data2B, r2);
fs.close(); fs.close();
} }
/**
* Check the computation of the mini stream size when the mini FAT sectors contain unallocated mini sectors.
* https://github.com/apache/poi/pull/182
*/
@Test
void testComputeSize() throws Exception {
try (POIFSFileSystem fs = new POIFSFileSystem()) {
fs.getPropertyTable().getRoot().setStorageClsid(new ClassID("000C108400000000C000000000000046")); // MSI storage class
// create 8 mini FAT sectors fully allocated
for (int i = 0; i < 8 * 128; i++) {
fs.getRoot().createDocument("Entry " + i, new ByteArrayInputStream(new byte[64]));
}
// Mini FAT Sector #1: Unallocate all the mini sectors
for (int i = 0; i < 128; i++) {
fs.getRoot().getEntry("Entry " + i).delete();
}
// Mini FAT Sector #2: Unallocate 8 mini sectors at the beginning
for (int i = 128; i < 128 + 8; i++) {
fs.getRoot().getEntry("Entry " + i).delete();
}
// Mini FAT Sector #3: Unallocate 4 mini sectors in the middle
for (int i = 2 * 128 + 64; i < 2 * 128 + 64 + 4; i++) {
fs.getRoot().getEntry("Entry " + i).delete();
}
// Mini FAT Sector #4: Unallocate all the mini sectors
for (int i = 3 * 128; i < 4 * 128; i++) {
fs.getRoot().getEntry("Entry " + i).delete();
}
// Mini FAT Sector #5: Unallocate 32 mini sectors at the end
for (int i = 5 * 128 - 32; i < 5 * 128; i++) {
fs.getRoot().getEntry("Entry " + i).delete();
}
// Mini FAT Sector #6: Unallocate 64 mini sectors at the beginning and 16 mini sectors at the end
for (int i = 5 * 128; i < 5 * 128 + 64; i++) {
fs.getRoot().getEntry("Entry " + i).delete();
}
for (int i = 6 * 128 - 16; i < 6 * 128; i++) {
fs.getRoot().getEntry("Entry " + i).delete();
}
// Mini FAT Sector #7: Unallocate all the mini sectors
for (int i = 6 * 128; i < 7 * 128; i++) {
fs.getRoot().getEntry("Entry " + i).delete();
}
// Mini FAT Sector #8: Unallocate all the mini sectors
for (int i = 7 * 128; i < 8 * 128; i++) {
fs.getRoot().getEntry("Entry " + i).delete();
}
fs.writeFilesystem(NullOutputStream.INSTANCE);
assertEquals(48128, fs.getPropertyTable().getRoot().getSize(), "mini stream size");
}
}
} }