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

bug 62624 -- fix recursion 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1845284 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tim Allison 2018-10-30 21:30:57 +00:00
parent a29586e45e
commit c956084b0d
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
View File

@ -352,13 +352,8 @@ public class VBAMacroReader implements Closeable {
DocumentNode document = (DocumentNode)entry; DocumentNode document = (DocumentNode)entry;
DocumentInputStream dis = new DocumentInputStream(document); DocumentInputStream dis = new DocumentInputStream(document);
readProjectProperties(dis, moduleNameMap, modules); readProjectProperties(dis, moduleNameMap, modules);
} else { } else if (entry instanceof DirectoryNode) {
for (Entry child : node) { findProjectProperties((DirectoryNode)entry, moduleNameMap, modules);
if (child instanceof DirectoryNode) {
findProjectProperties((DirectoryNode)child, moduleNameMap, modules);
}
}
} }
} }
} }
@ -369,13 +364,8 @@ public class VBAMacroReader implements Closeable {
DocumentNode document = (DocumentNode)entry; DocumentNode document = (DocumentNode)entry;
DocumentInputStream dis = new DocumentInputStream(document); DocumentInputStream dis = new DocumentInputStream(document);
readNameMapRecords(dis, moduleNameMap, modules.charset); readNameMapRecords(dis, moduleNameMap, modules.charset);
} else { } else if (entry.isDirectoryEntry()) {
for (Entry child : node) { findModuleNameMap((DirectoryNode)entry, moduleNameMap, modules);
if (child instanceof DirectoryNode) {
findModuleNameMap((DirectoryNode)child, moduleNameMap, modules);
}
}
} }
} }
} }