Author: tallison
Date: Tue Oct 30 21:30:57 2018
New Revision: 1845284
URL: http://svn.apache.org/viewvc?rev=1845284&view=rev
Log:
bug 62624 -- fix recursion
Modified:
poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
Modified: poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java?rev=1845284&r1=1845283&r2=1845284&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java Tue Oct
30 21:30:57 2018
@@ -352,13 +352,8 @@ public class VBAMacroReader implements C
DocumentNode document = (DocumentNode)entry;
DocumentInputStream dis = new DocumentInputStream(document);
readProjectProperties(dis, moduleNameMap, modules);
- } else {
- for (Entry child : node) {
- if (child instanceof DirectoryNode) {
- findProjectProperties((DirectoryNode)child,
moduleNameMap, modules);
- }
- }
-
+ } else if (entry instanceof DirectoryNode) {
+ findProjectProperties((DirectoryNode)entry, moduleNameMap,
modules);
}
}
}
@@ -369,13 +364,8 @@ public class VBAMacroReader implements C
DocumentNode document = (DocumentNode)entry;
DocumentInputStream dis = new DocumentInputStream(document);
readNameMapRecords(dis, moduleNameMap, modules.charset);
- } else {
- for (Entry child : node) {
- if (child instanceof DirectoryNode) {
- findModuleNameMap((DirectoryNode)child, moduleNameMap,
modules);
- }
- }
-
+ } else if (entry.isDirectoryEntry()) {
+ findModuleNameMap((DirectoryNode)entry, moduleNameMap,
modules);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
