Fixes for NULL_RETURNS Coverity Issues - Part 2

3 files changed, 12 insertions, 1 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
index efd83e892..0eaf26ee1 100644
--- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java
+++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
@@ -1642,7 +1642,9 @@ public class DRMTool {
                              new FileReader(
                                      mSourcePKISecurityDatabasePwdfile));
                     pwd = in.readLine();
-
+                    if (pwd == null) {
+                        pwd = "";
+                    }
                     mPwd = new Password(pwd.toCharArray());
 
                     mSourceToken.login(mPwd);
diff --git a/base/java-tools/src/com/netscape/cmstools/OCSPClient.java b/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
index fc2f081e9..7d581fdb8 100644
--- a/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
+++ b/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
@@ -174,6 +174,9 @@ public class OCSPClient {
         ResponseData rd = basic.getResponseData();
         for (int i = 0; i < rd.getResponseCount(); i++) {
             SingleResponse rd1 = rd.getResponseAt(i);
+            if (rd1 == null) {
+                throw new Exception("No OCSP Response data.");
+            }
             System.out.println("CertID.serialNumber=" +
                     rd1.getCertID().getSerialNumber());
             CertStatus status1 = rd1.getCertStatus();
diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
index ad1c485c0..532505867 100644
--- a/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
+++ b/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
@@ -224,6 +224,9 @@ public class PKCS12Export {
         try {
             BufferedReader in = new BufferedReader(new FileReader(pwdfile));
             pwd = in.readLine();
+            if (pwd == null) {
+                pwd = "";
+            }
         } catch (Exception e) {
             debug("Failed to read the keydb password from the file. Exception: " + e.toString());
             System.exit(1);
@@ -233,6 +236,9 @@ public class PKCS12Export {
         try {
             BufferedReader in = new BufferedReader(new FileReader(pk12pwdfile));
             pk12pwd = in.readLine();
+            if (pk12pwd == null) {
+                pk12pwd = "";
+            }
         } catch (Exception e) {
             debug("Failed to read the keydb password from the file. Exception: " + e.toString());
             System.exit(1);