From c53ca291e21761f1de5417ef596afba395a7f5d1 Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru@redhat.com>
Date: Wed, 6 Jun 2012 16:55:54 -0400
Subject: Fixes for NULL_RETURNS Coverity Issues - Part 2

---
 base/java-tools/src/com/netscape/cmstools/PKCS12Export.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'base/java-tools/src/com/netscape/cmstools/PKCS12Export.java')

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);
-- 
cgit