FIX: coverity resource leaks.

diff --git a/src/org/cacert/gigi/DevelLauncher.java b/src/org/cacert/gigi/DevelLauncher.java
index 6a462f21ccae7a7a5a9d394049d6537dd960f442..5d1686728378524f39eb7ed416532a06e730642f 100644 (file)
--- a/src/org/cacert/gigi/DevelLauncher.java
+++ b/src/org/cacert/gigi/DevelLauncher.java
@@ -32,7 +32,9 @@ public class DevelLauncher {
 
     public static void main(String[] args) throws Exception {
         Properties mainProps = new Properties();
 
     public static void main(String[] args) throws Exception {
         Properties mainProps = new Properties();

-        mainProps.load(new FileInputStream("config/gigi.properties"));
+        try (FileInputStream inStream = new FileInputStream("config/gigi.properties")) {
+            mainProps.load(inStream);
+        }

         for (int i = 0; i < args.length; i++) {
             if (args[i].equals("--port")) {
                 mainProps.setProperty("port", args[i + 1]);
         for (int i = 0; i < args.length; i++) {
             if (args[i].equals("--port")) {
                 mainProps.setProperty("port", args[i + 1]);

diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java
index 49658fb7b3c7eed83aec542b3089d6c8a3867582..ef9b19cc71cbab89c6bbb5193479036eb90d1dd9 100644 (file)
--- a/src/org/cacert/gigi/database/DatabaseConnection.java
+++ b/src/org/cacert/gigi/database/DatabaseConnection.java
@@ -120,11 +120,12 @@ public class DatabaseConnection {
         try {
             Statement s = getInstance().c.createStatement();
             while (version < CURRENT_SCHEMA_VERSION) {
         try {
             Statement s = getInstance().c.createStatement();
             while (version < CURRENT_SCHEMA_VERSION) {

-                InputStream resourceAsStream = DatabaseConnection.class.getResourceAsStream("upgrade/from_" + version + ".sql");
-                if (resourceAsStream == null) {
-                    throw new Error("Upgrade script from version " + version + " was not found.");
+                try (InputStream resourceAsStream = DatabaseConnection.class.getResourceAsStream("upgrade/from_" + version + ".sql")) {
+                    if (resourceAsStream == null) {
+                        throw new Error("Upgrade script from version " + version + " was not found.");
+                    }
+                    SQLFileManager.addFile(s, resourceAsStream, ImportType.PRODUCTION);

                 }
                 }

-                SQLFileManager.addFile(s, resourceAsStream, ImportType.PRODUCTION);

                 version++;
             }
             s.addBatch("INSERT INTO schemeVersion SET version='" + version + "'");
                 version++;
             }
             s.addBatch("INSERT INTO schemeVersion SET version='" + version + "'");

diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
index 8efa4ee1870910f961b1476ae743d1cee7454ccb..9df2e4822c7f33eae8cc8f1003011e8a44078c4e 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Domain.java
+++ b/src/org/cacert/gigi/dbObjects/Domain.java
@@ -1,6 +1,7 @@
 package org.cacert.gigi.dbObjects;
 
 import java.io.IOException;
 package org.cacert.gigi.dbObjects;
 
 import java.io.IOException;

+import java.io.InputStream;

 import java.net.IDN;
 import java.util.Arrays;
 import java.util.Collections;
 import java.net.IDN;
 import java.util.Arrays;
 import java.util.Collections;


@@ -70,8 +71,8 @@ public class Domain implements IdCachable {
     private static final Set<String> IDNEnabledTLDs;
     static {
         Properties CPS = new Properties();
     private static final Set<String> IDNEnabledTLDs;
     static {
         Properties CPS = new Properties();

-        try {
-            CPS.load(Domain.class.getResourceAsStream("CPS.properties"));
+        try (InputStream resourceAsStream = Domain.class.getResourceAsStream("CPS.properties")) {
+            CPS.load(resourceAsStream);

             IDNEnabledTLDs = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(CPS.getProperty("IDN-enabled").split(","))));
         } catch (IOException e) {
             throw new Error(e);
             IDNEnabledTLDs = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(CPS.getProperty("IDN-enabled").split(","))));
         } catch (IOException e) {
             throw new Error(e);

diff --git a/src/org/cacert/gigi/util/DNSUtil.java b/src/org/cacert/gigi/util/DNSUtil.java
index 816b24731bc576635096e30ab691b1fb9e5e6b9b..7ebbf83d48e9a8b97f9657fc64ae68044110b838 100644 (file)
--- a/src/org/cacert/gigi/util/DNSUtil.java
+++ b/src/org/cacert/gigi/util/DNSUtil.java
@@ -40,6 +40,7 @@ public class DNSUtil {
         Attributes dnsLookup = context.getAttributes(name, new String[] {
             "TXT"
         });
         Attributes dnsLookup = context.getAttributes(name, new String[] {
             "TXT"
         });

+        context.close();

 
         return extractTextEntries(dnsLookup.get("TXT"));
     }
 
         return extractTextEntries(dnsLookup.get("TXT"));
     }