Fix: exceptional resource leaks.

diff --git a/util-testing/org/cacert/gigi/util/SimpleSigner.java b/util-testing/org/cacert/gigi/util/SimpleSigner.java
index 1c635c2e73a55082ea17124d3a8468293c3cb4ad..c6f4660fc57ac6170b52451a8e54d5f8063f3051 100644 (file)
--- a/util-testing/org/cacert/gigi/util/SimpleSigner.java
+++ b/util-testing/org/cacert/gigi/util/SimpleSigner.java
@@ -305,7 +305,9 @@ public class SimpleSigner {
                 Process p1 = Runtime.getRuntime().exec(call, null, new File("keys/unassured.ca"));
 
                 int waitFor = p1.waitFor();
-                f.delete();
+                if ( !f.delete()) {
+                    System.err.println("Could not delete SAN-File " + f.getAbsolutePath());
+                }
                 if (waitFor == 0) {
                     try (InputStream is = new FileInputStream(crt)) {
                         CertificateFactory cf = CertificateFactory.getInstance("X.509");

diff --git a/util/org/cacert/gigi/util/FetchLocales.java b/util/org/cacert/gigi/util/FetchLocales.java
index 87beaacef16fa53275f2771e2e60a96f44f7fe05..21a789f3342c8757f03e95d047123841ad744f6d 100644 (file)
--- a/util/org/cacert/gigi/util/FetchLocales.java
+++ b/util/org/cacert/gigi/util/FetchLocales.java
@@ -35,7 +35,9 @@ public class FetchLocales {
     public static void main(String[] args) throws IOException, ParserConfigurationException, TransformerException {
         System.out.println("downloading locales ...");
         File locale = new File("locale");
-        locale.mkdir();
+        if ( !locale.mkdir()) {
+            throw new IOException("Could not create locales directory.");
+        }
 
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         DocumentBuilder db = dbf.newDocumentBuilder();