louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #776 from W25X80/feature_resource_leaks

Browse Source 
Fix potential resource leaks in core file processing classes
This commit is contained in:
Jochen Staerk
2025-03-25 19:17:55 +01:00
committed by GitHub
parent 4c4d57da1c 7fa2d70128
commit 3f22945492
6 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
View File

@@ -307,12 +307,13 @@ public class Main {
// Plain Java // Plain Java
// based on https://mkyong.com/java/how-to-convert-inputstream-to-string-in-java/ // based on https://mkyong.com/java/how-to-convert-inputstream-to-string-in-java/
private static String convertInputStreamToString(InputStream is) { private static String convertInputStreamToString(InputStream is) {
int DEFAULT_BUFFER_SIZE = 8192; try (InputStream inputStream = is) {
ByteArrayOutputStream result = new ByteArrayOutputStream(); int DEFAULT_BUFFER_SIZE = 8192;
byte[] buffer = new byte[DEFAULT_BUFFER_SIZE]; ByteArrayOutputStream result = new ByteArrayOutputStream();
int length; byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
try { int length;
while ((length = is.read(buffer)) != -1) {
while ((length = inputStream.read(buffer)) != -1) {
result.write(buffer, 0, length); result.write(buffer, 0, length);
} }
@@ -320,11 +321,10 @@ public class Main {
return result.toString(StandardCharsets.UTF_8.name()); return result.toString(StandardCharsets.UTF_8.name());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
return null;
// Java 10
// return result.toString(StandardCharsets.UTF_8);
} }
return null;
// Java 10
// return result.toString(StandardCharsets.UTF_8);
} }
/*** /***

3
library/src/main/java/org/mustangproject/XMLTools.java
View File

@@ -220,7 +220,8 @@ public class XMLTools extends XMLWriter {
} }
public static byte[] getBytesFromStream(InputStream fileinput) throws IOException { public static byte[] getBytesFromStream(InputStream fileinput) throws IOException {
return IOUtils.toByteArray (fileinput); // Stream closing responsibility is with the caller
return IOUtils.toByteArray(fileinput);
} }

7
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromPDFA.java
View File

@@ -90,9 +90,10 @@ public class ZUGFeRDExporterFromPDFA implements IZUGFeRDExporter {
protected byte[] inputstreamToByteArray(InputStream fileInputStream) throws IOException { protected byte[] inputstreamToByteArray(InputStream fileInputStream) throws IOException {
byte[] bytes = new byte[fileInputStream.available()]; byte[] bytes = new byte[fileInputStream.available()];
DataInputStream dataInputStream = new DataInputStream(fileInputStream); try (DataInputStream dataInputStream = new DataInputStream(fileInputStream)) {
dataInputStream.readFully(bytes); dataInputStream.readFully(bytes);
return bytes; return bytes;
}
} }
/*** /***

6
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
View File

@@ -138,9 +138,9 @@ public class ZUGFeRDInvoiceImporter {
return; return;
} }
final InputStream XMP = doc.getDocumentCatalog().getMetadata().exportXMPMetadata(); try (final InputStream XMP = doc.getDocumentCatalog().getMetadata().exportXMPMetadata()) {
xmpString = new String(XMLTools.getBytesFromStream(XMP), StandardCharsets.UTF_8);
xmpString = new String(XMLTools.getBytesFromStream(XMP), StandardCharsets.UTF_8); }
final PDEmbeddedFilesNameTreeNode etn = names.getEmbeddedFiles(); final PDEmbeddedFilesNameTreeNode etn = names.getEmbeddedFiles();
if (etn == null) { if (etn == null) {

19
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java
View File

@@ -142,8 +142,9 @@ public class ZUGFeRDVisualizer {
public String visualize(String xmlFilename, Language lang) public String visualize(String xmlFilename, Language lang)
throws IOException, TransformerException, ParserConfigurationException { throws IOException, TransformerException, ParserConfigurationException {
FileInputStream fis = new FileInputStream(xmlFilename); try (FileInputStream fis = new FileInputStream(xmlFilename)) {
return visualize(fis, lang); return visualize(fis, lang);
}
} }
public String visualize(InputStream inputXml, Language lang) public String visualize(InputStream inputXml, Language lang)
@@ -233,12 +234,14 @@ public class ZUGFeRDVisualizer {
protected String toFOP(String xmlFilename) protected String toFOP(String xmlFilename)
throws IOException, TransformerException, ParserConfigurationException { throws IOException, TransformerException, ParserConfigurationException {
EStandard theStandard;
FileInputStream fis = new FileInputStream(xmlFilename); try (FileInputStream fis = new FileInputStream(xmlFilename)) {
EStandard theStandard = findOutStandardFromRootNode(fis); theStandard = findOutStandardFromRootNode(fis);
fis = new FileInputStream(xmlFilename);//rewind :-( }
return toFOP(fis, theStandard); try (FileInputStream fis = new FileInputStream(xmlFilename)) {
return toFOP(fis, theStandard);
}
} }
protected String toFOP(InputStream is, EStandard theStandard) protected String toFOP(InputStream is, EStandard theStandard)

1
validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java
View File

@@ -312,6 +312,7 @@ public class ZUGFeRDValidator {
XMLWriter writer = new XMLWriter(sw, format); XMLWriter writer = new XMLWriter(sw, format);
try { try {
writer.write(document); writer.write(document);
writer.close();
} catch (Exception e) { } catch (Exception e) {
LOGGER.error(e.getMessage()); LOGGER.error(e.getMessage());
} }