fix: Avoid NPE if the CA's files cannot be listed

[gigi.git] / util-testing / org / cacert / gigi / util / SimpleSigner.java

diff --git a/util-testing/org/cacert/gigi/util/SimpleSigner.java b/util-testing/org/cacert/gigi/util/SimpleSigner.java
index c44c3850a7bc445f1f15cdaf8711d239c1fff84c..1cc9e9eeae6e8e7851e540113a6cc1da1fda9ce8 100644 (file)
--- a/util-testing/org/cacert/gigi/util/SimpleSigner.java
+++ b/util-testing/org/cacert/gigi/util/SimpleSigner.java
@@ -127,7 +127,7 @@ public class SimpleSigner {
                             "INNER JOIN certs ON certs.id=jobs.`targetId` " + //
                             "INNER JOIN profiles ON profiles.id=certs.profile " + //
                             "WHERE jobs.state='open' "//
-                    + "AND task='sign'");
+                            + "AND task='sign'");
 
                     getSANSs = new GigiPreparedStatement("SELECT contents, type FROM `subjectAlternativeNames` " + //
                             "WHERE `certId`=?");
@@ -232,8 +232,6 @@ public class SimpleSigner {
         }
     }
 
-    private static int counter = 0;
-
     private static void signCertificates() throws SQLException {
         GigiResultSet rs = readyCerts.executeQuery();
 
@@ -331,7 +329,11 @@ public class SimpleSigner {
                 }
                 String ca = caP.getProperty("ca") + "_2015_1";
                 File parent = new File("signer/ca");
-                for (File f : parent.listFiles()) {
+                File[] caFiles = parent.listFiles();
+                if (null == caFiles) {
+                    caFiles = new File[0];
+                }
+                for (File f : caFiles) {
                     if (f.getName().startsWith(caP.getProperty("ca"))) {
                         ca = f.getName();
                         break;