You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ta...@apache.org on 2018/10/31 00:59:17 UTC
svn commit: r1845300 -
/poi/trunk/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
Author: tallison
Date: Wed Oct 31 00:59:16 2018
New Revision: 1845300
URL: http://svn.apache.org/viewvc?rev=1845300&view=rev
Log:
bug 62624 -- ensure streams are closed...thanks to LGTM, and PJ!
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=1845300&r1=1845299&r2=1845300&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 Wed Oct 31 00:59:16 2018
@@ -350,8 +350,9 @@ public class VBAMacroReader implements C
for (Entry entry : node) {
if ("project".equalsIgnoreCase(entry.getName())) {
DocumentNode document = (DocumentNode)entry;
- DocumentInputStream dis = new DocumentInputStream(document);
- readProjectProperties(dis, moduleNameMap, modules);
+ try(DocumentInputStream dis = new DocumentInputStream(document)) {
+ readProjectProperties(dis, moduleNameMap, modules);
+ }
} else if (entry instanceof DirectoryNode) {
findProjectProperties((DirectoryNode)entry, moduleNameMap, modules);
}
@@ -362,8 +363,9 @@ public class VBAMacroReader implements C
for (Entry entry : node) {
if ("projectwm".equalsIgnoreCase(entry.getName())) {
DocumentNode document = (DocumentNode)entry;
- DocumentInputStream dis = new DocumentInputStream(document);
- readNameMapRecords(dis, moduleNameMap, modules.charset);
+ try(DocumentInputStream dis = new DocumentInputStream(document)) {
+ readNameMapRecords(dis, moduleNameMap, modules.charset);
+ }
} else if (entry.isDirectoryEntry()) {
findModuleNameMap((DirectoryNode)entry, moduleNameMap, modules);
}
@@ -485,7 +487,7 @@ public class VBAMacroReader implements C
try (DocumentInputStream dis = new DocumentInputStream(dirDocumentNode)) {
String streamName = null;
int recordId = 0;
- boolean inReferenceTwiddled = false;
+
try (RLEDecompressingInputStream in = new RLEDecompressingInputStream(dis)) {
while (true) {
recordId = in.readShort();
@@ -620,7 +622,8 @@ public class VBAMacroReader implements C
if (reserved != reservedByte) {
if (throwOnUnexpectedReservedByte) {
- throw new IOException("Expected " + Integer.toHexString(reservedByte) + "after name before Unicode name, but found: " +
+ throw new IOException("Expected " + Integer.toHexString(reservedByte) +
+ "after name before Unicode name, but found: " +
Integer.toHexString(reserved));
} else {
return new ASCIIUnicodeStringPair(ascii, reserved);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org