pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

depth check in property table

Browse Source
This commit is contained in:
PJ Fanning 2025-07-23 17:48:52 +01:00
parent 7c86c60f7c
commit c76be2df41
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
View File

@ -111,7 +111,7 @@ public final class PropertyTable implements BATManaged {
Property property = _properties.get(0);
if (property != null) {
if (property instanceof DirectoryProperty) {
populatePropertyTree((DirectoryProperty) property);
populatePropertyTree((DirectoryProperty) property, 0);
} else {
throw new IOException("Invalid format, cannot convert property " + property + " to DirectoryProperty");
}
@ -227,7 +227,14 @@ public final class PropertyTable implements BATManaged {
_header_block.setPropertyCount(countBlocks());
}
private void populatePropertyTree(DirectoryProperty root) throws IOException {
// Maximum depth of the property tree to prevent stackoverflow errors
private static int MAX_PROPERTY_DEPTH = 1000;
private void populatePropertyTree(final DirectoryProperty root, final int depth) throws IOException {
if (depth > MAX_PROPERTY_DEPTH) {
throw new IOException("Property tree too deep, likely a corrupt file");
}
int index = root.getChildIndex();
if (!Property.isValidIndex(index)) {
@ -246,7 +253,7 @@ public final class PropertyTable implements BATManaged {
root.addChild(property);
if (property.isDirectory()) {
populatePropertyTree(( DirectoryProperty ) property);
populatePropertyTree((DirectoryProperty) property, depth + 1);
}
index = property.getPreviousChildIndex();
if (isValidIndex(index)) {