From: Felix Dörre <felix@dogcraft.de>
Date: Fri, 20 Feb 2015 02:33:34 +0000 (+0100)
Subject: FIX: more Coverity, as charset, nullcheck, equals
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=aac731a4213533e5e9c3143f95e99af4b273b17a

FIX: more Coverity, as charset, nullcheck, equals
---

diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java
index d76fd6ef..6494bf8d 100644
--- a/src/org/cacert/gigi/email/EmailProvider.java
+++ b/src/org/cacert/gigi/email/EmailProvider.java
@@ -119,7 +119,7 @@ public abstract class EmailProvider {
                         }
                         Socket s1 = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(s, host, 25, true);
                         br = new BufferedReader(new InputStreamReader(s1.getInputStream(), "UTF-8"));
-                        pw = new PrintWriter(s1.getOutputStream());
+                        pw = new PrintWriter(new OutputStreamWriter(s1.getOutputStream(), "UTF-8"));
                         pw.print("EHLO www.cacert.org\r\n");
                         pw.flush();
                         if ( !Sendmail.readSMTPResponse(br, 250)) {
diff --git a/src/org/cacert/gigi/email/Sendmail.java b/src/org/cacert/gigi/email/Sendmail.java
index 3c915ab9..486f3c4e 100644
--- a/src/org/cacert/gigi/email/Sendmail.java
+++ b/src/org/cacert/gigi/email/Sendmail.java
@@ -3,6 +3,7 @@ package org.cacert.gigi.email;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.Socket;
 import java.security.GeneralSecurityException;
@@ -26,7 +27,7 @@ public class Sendmail extends EmailProvider {
 
         String[] bits = from.split(",");
 
-        try (Socket smtp = new Socket("localhost", 25); PrintWriter out = new PrintWriter(smtp.getOutputStream()); BufferedReader in = new BufferedReader(new InputStreamReader(smtp.getInputStream(), "UTF-8"));) {
+        try (Socket smtp = new Socket("localhost", 25); PrintWriter out = new PrintWriter(new OutputStreamWriter(smtp.getOutputStream(), "UTF-8")); BufferedReader in = new BufferedReader(new InputStreamReader(smtp.getInputStream(), "UTF-8"));) {
             readSMTPResponse(in, 220);
             out.print("HELO www.cacert.org\r\n");
             out.flush();
diff --git a/src/org/cacert/gigi/localisation/Language.java b/src/org/cacert/gigi/localisation/Language.java
index 4c6e3901..6a48f5aa 100644
--- a/src/org/cacert/gigi/localisation/Language.java
+++ b/src/org/cacert/gigi/localisation/Language.java
@@ -27,12 +27,15 @@ public class Language {
     static {
         LinkedList<Locale> supported = new LinkedList<>();
         File locales = new File("locale");
-        for (File f : locales.listFiles()) {
-            if ( !f.getName().endsWith(".xml")) {
-                continue;
+        File[] listFiles = locales.listFiles();
+        if (listFiles != null) {
+            for (File f : listFiles) {
+                if ( !f.getName().endsWith(".xml")) {
+                    continue;
+                }
+                String language = f.getName().split("\\.", 2)[0];
+                supported.add(getLocaleFromString(language));
             }
-            String language = f.getName().split("\\.", 2)[0];
-            supported.add(getLocaleFromString(language));
         }
         Collections.sort(supported, new Comparator<Locale>() {
 
diff --git a/src/org/cacert/gigi/output/template/IfStatement.java b/src/org/cacert/gigi/output/template/IfStatement.java
index fbd83bcf..39a89b80 100644
--- a/src/org/cacert/gigi/output/template/IfStatement.java
+++ b/src/org/cacert/gigi/output/template/IfStatement.java
@@ -28,7 +28,7 @@ public final class IfStatement implements Outputable {
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         Object o = vars.get(variable);
-        if ( !(o == Boolean.FALSE || o == null)) {
+        if ( !(o == null || o == Boolean.FALSE)) {
             iftrue.output(out, l, vars);
         } else if (iffalse != null) {
             iffalse.output(out, l, vars);
diff --git a/src/org/cacert/gigi/pages/PolicyIndex.java b/src/org/cacert/gigi/pages/PolicyIndex.java
index d6416b69..25e69446 100644
--- a/src/org/cacert/gigi/pages/PolicyIndex.java
+++ b/src/org/cacert/gigi/pages/PolicyIndex.java
@@ -21,18 +21,21 @@ public class PolicyIndex extends Page {
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         PrintWriter out = resp.getWriter();
         out.println("<ul>");
-        for (File f : root.listFiles()) {
-            String name = f.getName();
-            if ( !name.endsWith(".html")) {
-                continue;
+        File[] files = root.listFiles();
+        if (files != null) {
+            for (File f : files) {
+                String name = f.getName();
+                if ( !name.endsWith(".html")) {
+                    continue;
+                }
+                String display = name.replaceFirst("\\.html$", "");
+
+                out.print("<li><a href='");
+                out.print(name);
+                out.print("'>");
+                out.print(display);
+                out.println("</a></li>");
             }
-            String display = name.replaceFirst("\\.html$", "");
-
-            out.print("<li><a href='");
-            out.print(name);
-            out.print("'>");
-            out.print(display);
-            out.println("</a></li>");
         }
         out.println("</ul>");
     }
diff --git a/src/org/cacert/gigi/util/KeyStorage.java b/src/org/cacert/gigi/util/KeyStorage.java
index 9b3f11eb..7ce0d285 100644
--- a/src/org/cacert/gigi/util/KeyStorage.java
+++ b/src/org/cacert/gigi/util/KeyStorage.java
@@ -10,13 +10,17 @@ public class KeyStorage {
 
     public static File locateCrt(int id) {
         File parent = new File(crt, (id / 1000) + "");
-        parent.mkdirs();
+        if ( !parent.exists() && !parent.mkdirs()) {
+            throw new Error("cert folder could not be created");
+        }
         return new File(parent, id + ".crt");
     }
 
     public static File locateCsr(int id) {
         File parent = new File(csr, (id / 1000) + "");
-        parent.mkdirs();
+        if ( !parent.exists() && !parent.mkdirs()) {
+            throw new Error("csr folder could not be created");
+        }
         return new File(parent, id + ".csr");
     }
 }